Update, built Contact Page

This commit is contained in:
YourWishes committed 2018-03-10 21:26:44 +11:00
1 parent ceb48e104c
commit c24c29c899
33 files changed
+1041 -134

No files matched your search

+4
View File
@@ -33,6 +33,10 @@
"npm": "^5.7.1", "npm": "^5.7.1",
"react": "^16.2.0", "react": "^16.2.0",
"react-dom": "^16.2.0", "react-dom": "^16.2.0",
"react-redux": "^5.0.7",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2",
"redux": "^3.7.2",
"three": "^0.90.0" "three": "^0.90.0"
}, },
"devDependencies": { "devDependencies": {
+6
View File
@@ -0,0 +1,6 @@
{
"vertices": [-0.447217,0.209972,0.061595,-0.334375,0.209972,0.062628,-0.447217,0.578722,0.061595,-0.334375,0.578722,0.062628,-0.180334,-0.427053,0.004973,-0.161108,-0.420497,0.004973,-0.171021,-0.396562,-0.002166,-0.187598,-0.396646,-0.002166,-0.187891,-0.396623,0.012427,-0.171313,-0.396538,0.012427,-0.176746,-0.434512,0.013331,-0.15752,-0.427956,0.013331,0.138104,-0.567143,0.521536,0.12626,-0.553945,0.503403,0.142706,-0.468908,0.524518,0.156666,-0.464706,0.545264,0.182803,-0.309555,0.579606,0.160523,-0.382448,0.548301,0.172162,-0.29341,0.563199,0.147008,-0.375884,0.527861,0.284663,-0.255496,0.732278,0.265755,-0.249023,0.703374,0.26569,-0.223675,0.702694,0.284597,-0.230147,0.731598,0.219493,-0.2592,0.633542,0.213621,-0.236393,0.624141,-0.032194,-0.62829,0.265285,-0.028331,-0.603798,0.270595,0.036121,-0.641015,0.369641,0.038177,-0.66602,0.373328,0.094268,-0.614159,0.456932,0.101892,-0.635158,0.468929,-0.168834,-0.46745,0.052788,-0.177893,-0.487004,0.039427,0.338171,-0.22029,0.756414,0.341296,-0.236027,0.761692,0.324077,-0.240758,0.746139,0.324126,-0.222016,0.745572,0.365626,-0.196281,0.807263,0.369539,-0.211267,0.813711,0.326535,-0.24243,0.734925,0.326584,-0.223689,0.734358,0.307611,-0.243169,0.730814,0.30766,-0.224427,0.730247,0.297345,-0.224038,0.742221,0.297296,-0.242779,0.742788,0.181903,-0.463041,0.543442,0.162291,-0.574084,0.518414,0.158515,-0.372979,0.505454,0.18512,-0.285664,0.542827,0.153984,-0.471445,0.501949,0.138609,-0.547688,0.482158,0.302897,-0.21775,0.71917,0.228987,-0.22528,0.607307,0.283989,-0.211277,0.690266,0.303028,-0.268447,0.72053,0.28412,-0.261975,0.691626,0.24073,-0.270895,0.626109,0.206401,-0.317954,0.575641,0.185531,-0.386109,0.546313,0.354946,-0.168372,0.865374,0.347856,-0.160691,0.854355,-0.164043,-0.497089,0.020731,-0.158221,-0.470648,0.024751,-0.151482,-0.456099,0.034476,-0.145925,-0.457982,0.047452,-0.166798,-0.461292,0.012595,-0.147823,-0.451002,0.013272,0.057523,-0.678801,0.363063,-0.015777,-0.640818,0.250567,0.123992,-0.645958,0.462774,0.108745,-0.60396,0.438779,0.053419,-0.628791,0.355699,-0.008043,-0.591833,0.261197,0.193181,-0.465578,0.520873,0.179222,-0.46978,0.500126,0.17464,-0.567827,0.497169,0.162796,-0.55463,0.479036,0.208712,-0.294063,0.538852,0.18353,-0.37664,0.503476,0.197039,-0.383204,0.523906,0.219352,-0.310208,0.555259,0.321262,-0.230701,0.707422,0.302354,-0.224229,0.678518,0.321327,-0.25605,0.708102,0.302419,-0.249577,0.679197,0.256096,-0.259782,0.609275,0.250225,-0.236974,0.599873,0.377311,-0.211602,0.803311,0.373398,-0.196616,0.796863,0.350933,-0.236298,0.753571,0.347815,-0.22056,0.748303,0.074821,-0.666577,0.349121,0.072765,-0.641572,0.345434,0.00451,-0.628854,0.241169,0.008374,-0.604361,0.246479,0.138476,-0.635759,0.444631,0.130852,-0.61476,0.432634,-0.141135,-0.48762,0.015395,-0.132069,-0.468066,0.028766,-0.140588,-0.453666,0.023283,-0.147327,-0.468215,0.013559,0.365549,-0.168603,0.858662,0.358459,-0.160922,0.847644,-0.17129,-0.455795,0.005536,-0.152315,-0.445505,0.006213,0.320165,-0.093563,0.876183,0.328855,-0.093289,0.889357,0.331278,-0.093765,0.870465,0.339969,-0.093491,0.883639,-0.434998,0.497472,0.074152,-0.415186,0.497472,0.074249,-0.434998,0.516222,0.074152,-0.415186,0.516222,0.074249,-0.365149,0.497472,0.075166,-0.345337,0.497472,0.075262,-0.365149,0.516222,0.075166,-0.345337,0.516222,0.075262,-0.434998,0.384972,0.074152,-0.415186,0.384972,0.074249,-0.434998,0.403722,0.074152,-0.415186,0.403722,0.074249,-0.434998,0.272472,0.074152,-0.415186,0.272472,0.074249,-0.434998,0.291222,0.074152,-0.415186,0.291222,0.074249,-0.365149,0.384972,0.075166,-0.345337,0.384972,0.075262,-0.365149,0.403722,0.075166,-0.345337,0.403722,0.075262,-0.365149,0.272472,0.075166,-0.345337,0.272472,0.075262,-0.365149,0.291222,0.075166,-0.345337,0.291222,0.075262,-0.415125,0.497472,0.061926,-0.415125,0.516222,0.061926,-0.434937,0.497472,0.061734,-0.434937,0.516222,0.061734,-0.345264,0.497472,0.062763,-0.345264,0.516222,0.062763,-0.365088,0.516222,0.062666,-0.365088,0.497472,0.062666,-0.415125,0.272472,0.061926,-0.415125,0.291222,0.061926,-0.415125,0.384972,0.061926,-0.415125,0.403722,0.061926,-0.434937,0.403722,0.061734,-0.434937,0.384972,0.061734,-0.434937,0.272472,0.061734,-0.434937,0.291222,0.061734,-0.365088,0.384972,0.062666,-0.345264,0.384972,0.062763,-0.345264,0.403722,0.062763,-0.365088,0.403722,0.062666,-0.345264,0.272472,0.062763,-0.345264,0.291222,0.062763,-0.365088,0.291222,0.062666,-0.365088,0.272472,0.062666,-0.2052,0.103722,0.074899,-0.1677,0.103722,0.074732,-0.2052,0.153722,0.074899,-0.1677,0.153722,0.074732,-0.275916,0.103722,0.07486,-0.238416,0.103722,0.074693,-0.275916,0.153722,0.07486,-0.238416,0.153722,0.074693,-0.417419,0.103722,0.07464,-0.379919,0.103722,0.074473,-0.417419,0.153722,0.07464,-0.379919,0.153722,0.074473,-0.34668,0.103722,0.074823,-0.30918,0.103722,0.074656,-0.34668,0.153722,0.074823,-0.30918,0.153722,0.074656,-0.2052,0.028722,0.074899,-0.1677,0.028722,0.074732,-0.2052,0.078722,0.074899,-0.1677,0.078722,0.074732,-0.2052,-0.046278,0.074899,Line truncated
"normals": [-0.009154,0,0.999958,-0.085914,0.251937,0.963923,-0.044639,0.240654,0.969584,-0.001169,0.228313,0.973587,0.004533,-0.024436,-0.999691,0.000122,-0.023806,-0.999717,0.008528,-0.025007,-0.999651,-0.919482,-0.393103,0.004702,-0.919915,-0.391811,0.015533,-0.915305,-0.402372,-0.017714,-0.92248,-0.352983,0.15631,0.959067,0.282554,0.01879,0.958785,0.276738,-0.064396,0.965651,0.253621,-0.056514,0.934482,0.270234,-0.231769,0.831391,-0.016971,-0.555429,0.830841,-0.020843,-0.556119,0.831186,-0.019508,-0.555652,0.83136,-0.019774,-0.555382,0.831563,-0.016695,-0.55518,0.832041,-0.015142,-0.554507,0.832376,-0.014453,-0.554023,0.831412,-0.017565,-0.555379,0.834744,-0.01261,-0.550494,0.834712,-0.012503,-0.550544,0.804344,-0.013855,-0.594003,0.757618,-0.016718,-0.652484,0.833863,-0.012893,-0.55182,0.833271,-0.013288,-0.552705,0.836295,-0.013092,-0.548124,0.835318,-0.012616,-0.549622,0.836303,-0.013,-0.548113,0.834652,-0.012469,-0.550636,0.833501,-0.013115,-0.552362,0.832918,-0.01368,-0.553227,0.836472,-0.013191,-0.547851,0.836469,-0.013201,-0.547856,0.851909,-0.002757,-0.523683,0.651919,-0.069849,-0.755065,0.798362,-0.020982,-0.601813,0.612828,-0.025491,-0.789805,0.935119,0.219407,-0.278232,0.961768,0.15351,-0.226798,-0.353153,0.02921,0.93511,-0.213314,0.030098,0.97652,-0.498344,0.070327,0.864122,-0.213314,0.030098,0.97652,0.126369,-0.030325,-0.99152,-0.070842,0.984196,-0.162293,-0.196432,0.953471,-0.228708,-0.079903,0.986628,-0.142056,-0.259269,0.931904,-0.253641,0.043768,-0.991906,0.11919,-0.054296,-0.995311,-0.080055,0.026297,-0.987864,0.153078,0.145418,-0.976831,0.15702,-0.546928,0.149115,-0.823793,-0.480353,0.479511,-0.734391,-0.072969,0.182121,-0.980565,-0.000451,0.408846,-0.912603,0.541317,-0.198378,0.817082,0.484838,-0.464999,0.740748,0.863758,-0.301164,0.404008,0.831415,-0.412902,0.371835,0.820655,-0.445215,0.358202,0.539267,-0.214715,0.814302,0.881792,-0.126554,0.454343,0.472168,-0.50546,0.722197,0.64694,-0.024743,-0.762139,0.648972,-0.021263,-0.760515,0.281115,-0.902401,-0.326569,-0.140096,-0.971698,-0.1902,0.329655,-0.790563,0.516079,0.246289,-0.88599,0.392891,0.696216,-0.695557,0.177437,0.55193,-0.832054,-0.055309,0.40755,-0.872327,-0.27009,0.037958,-0.996004,0.080845,0.111755,0.982808,0.146966,0.025526,0.999549,0.015815,0.384339,0.901664,-0.198208,0.38888,0.862689,-0.323327,-0.146548,0.958753,-0.243548,0.206406,0.764324,-0.610905,-0.711313,0.206405,-0.671886,-0.499664,0.402614,-0.766967,-0.273035,0.404573,-0.872796,-0.329025,0.791647,-0.514818,0.121965,0.682762,-0.720389,-0.013475,0.39837,-0.917126,-0.517653,0.339881,-0.785185,-0.054585,0.16491,-0.984797,-0.484514,0.466736,-0.739868,0.902564,0.411332,-0.127214,0.818014,0.477029,-0.321398,0.528375,-0.240175,0.814331,0.683741,-0.3485,0.641129,0.741948,-0.433377,0.511563,-0.108302,-0.97528,-0.192611,-0.257491,-0.892137,-0.371201,0.183599,-0.781853,-0.595817,0.739942,-0.576914,0.345913,0.741436,-0.574798,0.346237,0.353159,-0.604254,-0.714252,0.893999,-0.445578,0.047182,0.303633,-0.781154,0.545532,0.768727,-0.561701,-0.30586,-0.027578,0.9975,-0.065068,0.217927,0.925514,0.309728,0.481348,0.854675,-0.194511,0.628415,0.776917,0.038657,0.29066,0.835531,-0.466267,-0.135247,0.964344,-0.227483,0.421449,-0.876877,-0.231232,0.124659,-0.969493,0.211052,0.509294,-0.857274,-0.075509,-0.091566,-0.988968,-0.116435,0.208866,-0.809074,-0.549339,-0.251359,-0.897733,-0.361793,0.265035,0.885081,0.382607,0.642163,0.763923,0.063624,0.753566,-0.602781,0.262284,0.396312,-0.683368,0.613143,-0.395404,0.684676,-0.612269,0.064335,0.589055,-0.805528,-0.830841,0.020846,0.55612,-0.831185,0.019512,0.555653,-0.83136,0.019775,0.555383,-0.83139,0.016973,0.55543,-0.831411,0.017565,0.55538,-0.831562,0.016695,0.555181,-0.832041,0.015142,0.554507,-0.832376,0.014454,0.554023,-0.834712,0.012504,0.550545,-0.835496,0.012577,0.549353,-0.835496,0.012576,0.549353,-0.834743,0.01261,0.550495,-0.833863,0.012894,0.551821,-0.833271,0.013289,0.552705,-0.935252,-0.217805,0.279042,-0.83951,0.011575,0.54322,-0.961049,-0.151426,0.231205,-0.756242,0.033989,0.653409,-0.835319,0.012616,0.549621,-0.836303,0.013001,0.548113,-0.834653,0.012469,0.550635,-0.836295,0.013093,0.548124,-0.832919,0.01368,0.553226,-0.833502,0.013115,0.552361,-0.83115,0.005351,0.556022,-0.830511,0.004197,0.556986,-0.697691,-0.145688,0.701429,-0.697036,-0.151585,0.70083,-0.871715,0.202,-0.44644,-0.830724,0.427035,-0.357125,0.033725,-0.284387,0.958116,0.013223,-0.397152,0.917658,0.004126,-0.42727,0.904114,0.078144,-0.107332,0.991148,-0.280521,0.913854,-0.293562,-0.188437,0.94822,-0.255675,-0.254483,0.927365,-0.274287,-0.313721,0.912129,-0.26382,-0.860167,-0.014742,-0.509799,-0.79304,0.181104,-0.581627,-0.860558,-0.013158,-0.509182,-0.552428,-0.831844,0.053472,-0.122064,-0.68183,0.721255,-0.284284,-0.819091,0.49827,-0.427027,-0.859722,0.280225,-0.313595,0.862043,0.39817,-0.431894,0.875162,0.218081,-0.625973,0.777625,-0.058799,-0.695367,0.696473,-0.17717,-0.830839,0.414043,-0.371853,-0.883789,0.18247,-0.430838,0.166851,-0.954624,0.246688,0.2Line truncated
"uvs": [[7.56694,7.0625,6.438537,10.75,6.438537,7.0625,7.56694,10.75,9.299577,0.757816,9.200437,0.997168,9.107324,0.692252,9.034661,0.99632,-7.197548,0.997408,-7.143267,0.617665,-7.031774,0.996559,-7.335521,0.683229,1.002832,2.106669,1.316771,2.020933,1.002592,2.252603,1.242184,1.937356,0.996559,2.252603,0.617665,2.020933,0.99632,2.106669,0.692252,1.937356,-13.017143,-0.679587,-13.304129,0.164434,-13.230465,-0.81668,-13.555122,0.200522,-13.621195,1.021907,-13.830873,1.907675,-14.022512,1.741619,-13.377892,1.093348,-15.526443,2.31139,-15.526443,2.564965,-15.870195,2.238448,-15.870195,2.492023,-14.686543,2.229578,-14.581203,2.460238,-10.211456,-1.111524,-11.383949,-1.511792,-10.140018,-1.354827,-11.420036,-1.762784,-12.438828,-1.268236,-12.575922,-1.481556,-7.652864,0.313525,-7.486807,0.121885,-16.431999,2.425631,-16.206314,2.382598,-16.374584,2.584444,-16.206314,2.570098,-16.955765,2.80976,-17.027531,2.65812,18.125874,2.556837,17.987257,2.362706,18.125874,2.369337,17.987257,2.550206,-0.382598,1.210504,-0.550206,1.415244,-0.570098,1.210504,-0.362706,1.415244,-16.125874,1.127961,-15.987257,1.263169,-16.206314,1.210504,-16.030392,1.415244,18.206314,1.210504,17.987257,1.263169,18.125874,1.127961,18.030392,1.415244,1.781628,1.240086,2.884489,1.245179,1.799478,1.460477,2.81668,1.465569,1.129453,1.24324,1.991598,1.24324,1.093348,1.462054,1.907675,1.462054,-0.679587,1.467146,0.146197,1.24324,0.164434,1.462054,-0.610303,1.248332,-16.030392,2.550206,-16.030392,2.362706,17.870195,1.462054,17.870195,1.24324,15.73402,1.24324,16.527966,1.24324,15.830873,1.462054,16.581203,1.462054,17.526443,1.462054,17.526443,1.24324,-15.870195,1.240086,-15.526443,1.240086,-15.870195,1.460477,-15.526443,1.460477,-14.738644,1.240086,-14.686543,1.460477,-0.362706,1.263169,-0.113027,1.240086,-0.238448,1.460477,-14.1173,1.240086,-14.022512,1.460477,0.258381,1.460477,1.013428,1.240086,0.978093,1.460477,0.340516,1.240086,-17.388481,3.07087,-17.259304,3.150789,0.027097,1.245179,0.290314,1.223672,0.121885,1.465569,9.598279,1.223672,9.736786,1.248332,9.652864,1.467146,0.313525,1.467146,0.432972,1.223672,-7.232864,0.49101,-7.425117,0.589381,-7.476604,0.290314,1.709686,1.223672,1.410619,1.531594,1.567028,1.223672,-11.437885,1.245179,-10.104682,1.245179,-11.420036,1.465569,-10.140018,1.465569,-12.575922,1.465569,-12.64373,1.245179,13.383949,1.467146,14.369543,1.248332,14.438828,1.467146,13.365711,1.248332,12.211456,1.467146,12.247561,1.248332,-7.404673,1.245179,-7.486807,1.465569,-1.268236,1.467146,-1.160426,1.248332,3.587068,1.245179,3.481556,1.465569,15.301426,0.164047,15.228167,-0.815203,15.55242,0.200133,15.014847,-0.678111,15.375271,1.094118,15.618574,1.022677,15.82881,1.909463,16.020449,1.743407,17.526443,2.567696,17.870195,2.241179,17.870195,2.494754,17.526443,2.314121,16.685408,2.232062,16.580069,2.462721,18.911634,2.80976,18.417316,2.425631,18.9834,2.65812,18.359905,2.584444,13.38356,-1.509087,12.140785,-1.352209,13.419648,-1.760082,12.212226,-1.108904,14.574444,-1.47926,14.437352,-1.265937,9.654652,0.315589,9.488595,0.12395,9.565461,0.460963,9.443786,0.318305,1.799867,1.021272,2.815203,1.026364,1.094118,1.022849,1.909463,1.022849,-0.678111,1.027941,0.164047,1.022849,-16.9834,1.08622,-16.417316,1.028059,-16.431999,1.153247,-17.027531,1.208388,-0.494754,1.022849,-0.241179,1.021272,-0.550206,1.263169,17.870195,1.022849,15.82881,1.022849,16.580069,1.022849,17.526443,1.022849,-15.870195,1.021272,-15.526443,1.021272,-14.685408,1.021272,-14.020449,1.021272,0.256593,1.021272,0.977323,1.021272,18.359905,1.028059,18.374584,1.153247,18.911634,1.08622,18.955765,1.208388,19.390762,3.07087,19.261585,3.150789,2.80976,1.208388,3.150789,1.497084,3.150789,1.622564,2.80976,1.08622,-1.07087,1.622564,-1.07087,1.497084,-0.65812,1.208388,-0.65812,1.08622,9.443786,1.071598,9.378281,1.464183,9.186028,1.464183,0.460963,1.071598,0.646759,1.464183,0.318305,1.071598,0.12395,1.026364,1.539037,1.071598,1.684411,1.027941,9.654652,1.027941,1.353241,1.464183,9.565461,1.071598,0.548389,1.464183,0.49101,1.531594,-7.443786,1.071598,-7.186028,1.464183,-7.476604,1.223672,-11.419648,1.026364,-10.140785,1.026364,-12.574444,1.026364,13.38356,1.027941,14.437352,1.027941,12.212226,1.027941,-7.488595,1.026364,3.47926,1.026364,-1.265937,1.027941,-17.304968,3.814446,-17.462852,3.813421,3.814446,1.862198,3.814446,1.986475,-1.813421,1.862198,-1.813421,1.986475,19.476276,3.813421,19.318394,3.814446,-7.335521,2.020933,-7.425117,1.531594,-7.232864,1.531594,-7.143267,2.020933,9.107324,1.937356,9.299577,1.937356,6.75881,9.9375,6.560649,10.125,6.560649,9.9375,6.75881,10.125,7.457315,9.9375,7.259155,10.125,7.259155,9.9375,7.457315,10.125,6.75881,8.8125,6.560649,9,6.560649,8.8125,6.75881,9,6.75881,7.6875,6.560649,7.875,6.560649,7.6875,6.75881,7.875,7.457315,8.8125,7.259155,9,7.259155,8.8125,7.457315,9,7.457315,7.6875,7.259155,7.875,7.259155,7.6875,7.457315,7.875,9.9375,2.870814,9.9375,2.747593,10.125,2.870814,10.125,2.747593,6.560649,2.869846,6.561327,2.745672,6.75881,2.870814,6.759487,2.74759Line truncated
"faces": [42,1,2,0,0,0,1,2,0,0,0,42,1,3,2,0,0,3,1,0,0,0,42,533,535,531,0,4,5,6,1,2,2,42,535,536,531,0,5,7,6,2,3,2,42,9,10,8,0,8,9,10,4,4,5,42,9,11,10,0,8,11,9,4,6,4,42,6,542,538,0,12,13,14,7,8,9,42,5,542,6,0,15,13,12,10,8,7,42,537,540,7,0,16,17,18,11,12,13,42,7,540,4,0,18,17,19,13,12,14,42,13,14,12,0,20,21,22,15,16,17,42,14,15,12,0,21,23,22,16,18,17,42,17,18,547,0,24,25,26,19,20,21,42,17,19,18,0,24,27,25,19,22,20,42,15,19,17,0,23,27,24,18,22,19,42,14,19,15,0,21,27,23,16,22,18,42,555,22,553,0,28,29,30,23,24,25,42,22,23,553,0,29,31,30,24,26,25,42,558,25,22,0,32,33,29,27,28,24,42,555,558,22,0,28,32,29,23,27,24,42,547,25,558,0,26,33,32,21,28,27,42,18,25,547,0,25,33,26,20,28,21,42,27,28,26,0,34,35,36,29,30,31,42,28,29,26,0,35,37,36,30,32,31,42,28,30,29,0,35,38,37,30,33,32,42,30,31,29,0,38,39,37,33,34,32,42,26,32,27,0,36,40,34,31,35,29,42,26,33,32,0,36,41,40,31,36,35,42,12,31,13,0,22,39,20,17,34,15,42,13,31,30,0,20,39,38,15,34,33,42,573,574,34,0,42,43,44,37,38,39,42,574,37,34,0,43,45,44,38,40,39,42,34,38,573,0,44,46,42,39,41,37,42,38,580,573,0,46,47,42,41,42,37,42,583,585,582,0,48,49,50,43,44,45,42,583,587,585,0,48,51,49,43,46,44,42,575,588,576,0,52,53,54,47,47,47,42,575,591,588,0,52,55,53,47,47,47,42,40,42,36,0,56,57,58,48,49,50,42,42,45,36,0,57,59,58,49,51,50,42,577,586,41,0,60,61,62,52,53,54,42,577,589,586,0,60,63,61,52,55,53,42,46,47,546,0,64,65,66,56,57,58,42,546,47,543,0,66,65,67,58,57,59,42,48,49,552,0,68,69,70,60,61,62,42,552,49,550,0,70,69,71,62,61,63,42,544,50,545,0,72,73,74,64,65,66,42,544,51,50,0,72,75,73,64,67,65,42,545,50,48,0,74,73,68,66,65,60,42,545,48,552,0,74,68,70,66,60,62,42,44,590,23,0,76,77,31,68,69,26,42,23,590,553,0,31,77,30,26,69,25,42,586,589,557,0,61,63,78,53,55,70,42,557,52,586,0,78,79,61,70,71,53,42,592,53,551,0,80,81,82,72,73,74,42,551,53,559,0,82,81,83,74,73,75,42,556,52,557,0,84,79,78,76,71,70,42,556,54,52,0,84,85,79,76,77,71,42,559,54,556,0,83,85,84,75,77,76,42,53,54,559,0,81,85,83,73,77,75,42,55,56,20,0,86,87,88,78,79,80,42,20,56,21,0,88,87,89,80,79,81,42,56,57,21,0,87,90,89,79,82,81,42,21,57,24,0,89,90,91,81,82,83,42,584,593,554,0,92,93,94,84,85,86,42,20,45,42,0,88,59,57,80,51,49,42,24,58,16,0,91,95,96,83,87,88,42,57,58,24,0,90,95,91,82,87,83,42,548,59,549,0,97,98,99,89,90,91,42,594,59,548,0,100,98,97,92,90,89,42,549,46,546,0,99,64,66,91,56,58,42,549,59,46,0,99,98,64,91,90,56,42,38,60,580,0,46,101,47,41,93,42,42,38,61,60,0,46,102,101,41,94,93,42,597,599,571,0,103,104,105,95,96,97,42,602,65,569,0,106,107,108,98,99,100,42,571,599,568,0,105,104,109,97,96,101,42,599,64,568,0,104,110,109,96,102,101,42,66,67,63,0,111,112,113,103,103,103,42,600,606,601,0,114,115,116,104,105,106,42,68,69,563,0,117,118,119,107,108,109,42,563,69,560,0,119,118,120,109,108,110,42,566,70,68,0,121,122,117,111,112,107,42,566,68,563,0,121,117,119,111,107,109,42,562,608,565,0,123,124,125,113,114,115,42,562,72,608,0,123,126,124,113,116,114,42,561,72,562,0,127,126,123,117,116,113,42,561,73,72,0,127,128,126,117,118,116,42,65,73,569,0,107,128,108,99,118,100,42,569,73,561,0,108,128,127,100,118,117,42,560,62,570,0,120,129,130,110,119,120,42,560,69,62,0,120,118,129,110,108,119,42,564,71,544,0,131,132,72,121,122,64,42,544,71,51,0,72,132,75,64,122,67,42,47,607,567,0,65,133,134,57,123,124,42,543,47,567,0,67,65,134,59,57,124,42,610,611,609,0,135,136,137,125,126,127,42,610,612,611,0,135,138,136,125,128,126,42,615,616,614,0,139,140,141,129,130,131,42,616,618,614,0,140,142,141,130,132,131,42,609,615,610,0,137,139,135,127,129,125,42,609,616,615,0,137,140,139,127,130,129,42,621,623,620,0,143,144,145,133,134,135,42,621,624,623,0,143,146,144,133,136,134,42,621,625,624,0,143,147,146,133,137,136,42,621,626,625,0,143,148,147,133,138,137,42,618,626,614,0,142,148,141,132,138,131,42,625,626,618,0,147,148,142,137,138,132,42,630,631,628,0,149,150,151,139,140,141,42,630,632,631,0,149,152,150,139,142,140,42,93,635,633,0,153,154,155,143,144,145,42,93,95,635,0,153,156,154,143,146,144,42,638,639,633,0,157,158,155,147,148,145,42,633,639,93,0,155,158,153,145,148,143,42,635,643,642,0,154,159,160,144,149,150,42,95,643,635,0,156,159,154,146,149,144,42,646,649,643,0,161,162,159,151,152,149,42,643,649,642,0,159,162,160,149,152,150,42,612,639,638,0,138,158,157,128,148,147,42,612,638,611,0,138,157,136,128,147,126,42,74,76,47,0,163,164,65,153,154,57,42,46,74,47,0,64,163,65,56,153,57,42,49,79,78,0,69,165,166,61,155,156,42,48,79,49,0,68,165,69,60,155,61,42,51,77,50,0,75,167,73,67,157,65,42,50,77,75,0,73,167,168,65,157,158,42,75,79,48,0,168,165,68,158,155,60,42,50,75,48,0,73,168,68,65,158,60,42,582,632,583,0,50,152,48,45,142,43,42,631,632,582,0,150,152,50,140,142,45,42,88,90,35,0,169,170,171,159,160,161,42,39,88,35,0,172,169,171,162,159,161,42,82,622,584,0,173,174,92,163,164,84,42,43,82,584,0,175,173,92,165,163,84,42,52,619,586,0,79,176,61,71,166,53,42,613,87,53,0,177,178,81,167,168,73,42,592,613,53,0,80,177,81,72,167,73,42,54,83,52,0,85,179,79,77,169,71,42,52,83,619,0,79,179,176,71,169,166,42,53,87,54,0,81,178,85,73,168,77,42,54,87,83,0,85,178,179,77,Line truncated
}
+14 -5
View File
@@ -10,11 +10,13 @@
* 1.0.0 - 2018/02/23 * 1.0.0 - 2018/02/23
*/ */
import React from 'react'; import React from 'react';
import { HashRouter, Route, Switch } from 'react-router-dom';
import Header from './components/Header'; import Header from './components/Header';
import Footer from './components/Footer'; import Footer from './components/Footer';
import IndexPage from './components/pages/IndexPage'; import IndexPage from './components/pages/IndexPage';
import ContactPage from './components/pages/ContactPage';
class App extends React.Component { class App extends React.Component {
constructor(props) { constructor(props) {
@@ -23,11 +25,18 @@ class App extends React.Component {
render() { render() {
return ( return (
<div className="c-app"> <HashRouter>
<Header /> <div className="c-app">
<IndexPage /> <Header />
<Footer />
</div> <Switch>
<Route exact path="/" component={IndexPage} />
<Route path="/contact" component={ContactPage} />
</Switch>
<Footer />
</div>
</HashRouter>
) )
} }
} }
+132
View File
@@ -0,0 +1,132 @@
module.exports = {
// t: current time, b: begInnIng value, c: change In value, d: duration
def: 'easeOutQuad',
swing: function (t, b, c, d) {
//alert(module.exports.default);
return module.exports[module.exports.def](t, b, c, d);
},
easeInQuad: function (t, b, c, d) {
return c*(t/=d)*t + b;
},
easeOutQuad: function (t, b, c, d) {
return -c *(t/=d)*(t-2) + b;
},
easeInOutQuad: function (t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t + b;
return -c/2 * ((--t)*(t-2) - 1) + b;
},
easeInCubic: function (t, b, c, d) {
return c*(t/=d)*t*t + b;
},
easeOutCubic: function (t, b, c, d) {
return c*((t=t/d-1)*t*t + 1) + b;
},
easeInOutCubic: function (t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t + b;
return c/2*((t-=2)*t*t + 2) + b;
},
easeInQuart: function (t, b, c, d) {
return c*(t/=d)*t*t*t + b;
},
easeOutQuart: function (t, b, c, d) {
return -c * ((t=t/d-1)*t*t*t - 1) + b;
},
easeInOutQuart: function (t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
return -c/2 * ((t-=2)*t*t*t - 2) + b;
},
easeInQuint: function (t, b, c, d) {
return c*(t/=d)*t*t*t*t + b;
},
easeOutQuint: function (t, b, c, d) {
return c*((t=t/d-1)*t*t*t*t + 1) + b;
},
easeInOutQuint: function (t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
return c/2*((t-=2)*t*t*t*t + 2) + b;
},
easeInSine: function (t, b, c, d) {
return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
},
easeOutSine: function (t, b, c, d) {
return c * Math.sin(t/d * (Math.PI/2)) + b;
},
easeInOutSine: function (t, b, c, d) {
return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
},
easeInExpo: function (t, b, c, d) {
return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
},
easeOutExpo: function (t, b, c, d) {
return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
},
easeInOutExpo: function (t, b, c, d) {
if (t==0) return b;
if (t==d) return b+c;
if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
},
easeInCirc: function (t, b, c, d) {
return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
},
easeOutCirc: function (t, b, c, d) {
return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
},
easeInOutCirc: function (t, b, c, d) {
if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
},
easeInElastic: function (t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3;
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
},
easeOutElastic: function (t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3;
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
},
easeInOutElastic: function (t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d/2)==2) return b+c; if (!p) p=d*(.3*1.5);
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
},
easeInBack: function (t, b, c, d, s) {
if (s == undefined) s = 1.70158;
return c*(t/=d)*t*((s+1)*t - s) + b;
},
easeOutBack: function (t, b, c, d, s) {
if (s == undefined) s = 1.70158;
return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
},
easeInOutBack: function (t, b, c, d, s) {
if (s == undefined) s = 1.70158;
if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
},
easeInBounce: function (t, b, c, d) {
return c - module.exports.easeOutBounce (d-t, 0, c, d) + b;
},
easeOutBounce: function (t, b, c, d) {
if ((t/=d) < (1/2.75)) {
return c*(7.5625*t*t) + b;
} else if (t < (2/2.75)) {
return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
} else if (t < (2.5/2.75)) {
return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
} else {
return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
}
},
easeInOutBounce: function (t, b, c, d) {
if (t < d/2) return module.exports.easeInBounce (t*2, 0, c, d) * .5 + b;
return module.exports.easeOutBounce (t*2-d, 0, c, d) * .5 + c*.5 + b;
}
}
+15 -11
View File
@@ -11,13 +11,14 @@
*/ */
import React from 'react'; import React from 'react';
import { Link } from 'react-router-dom';
const FooterLink = function(props) { const FooterLink = function(props) {
return ( return (
<span className="c-footer__link"> <span className="c-footer__link">
<a href={props.to} className="c-footer__link-link"> <Link to={props.to} className="c-footer__link-link">
{props.children} {props.children}
</a> </Link>
</span> </span>
) )
} }
@@ -30,16 +31,19 @@ class Footer extends React.Component {
render() { render() {
let year = new Date().getFullYear(); let year = new Date().getFullYear();
return ( return (
<footer className="c-footer"> <div className="c-footer__container">
<span className="c-footer__copyright"> <div className="c-footer__ghost"></div>
2012 ~ {year} | Dominic Masters.
</span>
<nav className="c-footer__links"> <footer className="c-footer">
<FooterLink to="/">Privacy Policy</FooterLink> <span className="c-footer__copyright">
<FooterLink to="/">Contact Us</FooterLink> 2012 ~ {year} | Dominic Masters.
</nav> </span>
</footer>
<nav className="c-footer__links">
<FooterLink to="/">Privacy Policy</FooterLink>
</nav>
</footer>
</div>
) )
} }
} }
+66
View File
@@ -0,0 +1,66 @@
/*
* Button
* Button
*
* Dependencies:
* styles/objects/_button.scss
*
* Version:
* 1.0.0 - 2018/03/07
*/
import React from 'react';
import { Link, NavLink } from 'react-router-dom';
class Button extends React.Component {
constructor(props) {
super(props);
}
render() {
let element;
let elementType = "button";
let children = this.props.children;
let type = "button";
let clazz = "o-button";
let props = Object.assign({}, this.props);
//Determine Button type
if(props.submit) {
type = "submit";
delete props.submit;
}
if(props.reset) {
type = "reset";
delete props.reset;
}
props.type = type;//Set onto type
//Link?
if(typeof props.to !== typeof undefined) {
elementType = NavLink;
delete props.type;
}
if(typeof props.href !== typeof undefined) {
elementType = "a";
delete props.type;
}
//Clazzes
if(this.props.style) clazz += " o-button--style-" + this.props.style;
if(this.props.className) clazz += " " + this.props.className;
props.className = clazz;
//Create element
element = React.createElement(
elementType,
props,
children
);
return element;
}
}
export default Button;
+41
View File
@@ -0,0 +1,41 @@
/*
* Contact Form
* Contact form.
*
* Version:
* 1.0.0 - 2018/03/06
*/
import React from 'react';
import { Form, InputGroup, TextInput } from './Form';
import Button from './../components/Button';
class ContactForm extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<Form className={this.props.className}>
<InputGroup title="Name">
<TextInput placeholder="Enter your name." />
</InputGroup>
<InputGroup title="Email">
<TextInput type="email" placeholder="Enter your email address." />
</InputGroup>
<InputGroup title="Message">
<TextInput multiline placeholder="Enter your message here." />
</InputGroup>
<Button to="/">Home</Button>
<Button submit>Contact</Button>
</Form>
);
}
}
export default ContactForm;
+84
View File
@@ -0,0 +1,84 @@
/*
* Form
* Form.
*
* Version:
* 1.0.0 - 2018/03/06
*/
import React from 'react';
//Form
class Form extends React.Component {
constructor(props) {
super(props);
}
render() {
let clazz = "c-form";
if(this.props.className) clazz += " " + this.props.className;
return (
<form className={clazz}>
{this.props.children}
</form>
)
}
}
//InputGroup
class InputGroup extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<div className="c-form__group">
<label className="c-form__label">{this.props.title}</label>
{ this.props.children }
</div>
);
}
}
//Input
class TextInput extends React.Component {
constructor(props) {
super(props);
}
render() {
let element;
let elementType = "input";
let children;
let props = Object.assign({
}, this.props);
let clazz = "c-form-input ";;
if(this.props.multiline) {
elementType = "textarea";
children = this.props.value;
clazz += "c-form-input--multiline ";
delete props.type;
delete props.multiline;
} else {
props.value = this.props.value;
}
if(this.props.className) clazz += this.props.className;
props.className = clazz;
element = React.createElement(
elementType,
props,
children
);
return element;
}
}
export { Form, InputGroup, TextInput };
+63 -1
View File
@@ -11,14 +11,76 @@
import React from 'react'; import React from 'react';
import FontAwesomeIcon from '@fortawesome/react-fontawesome'
import { NavLink } from 'react-router-dom';
import { faBars } from '@fortawesome/fontawesome-free-solid'
const MenuGroup = function(props) {
return (
<nav className="c-menu__group">
<h1 className="c-menu__group-title">{props.title}</h1>
{props.children}
</nav>
)
}
const MenuItem = function(props) {
return (
<NavLink className="c-menu__item" to={props.to}>
{props.children}
</NavLink>
)
}
class Menu extends React.Component { class Menu extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = {
open: false
}
}
toggleMenu() {
this.setState({
open: !this.state.open
});
} }
render() { render() {
if(this.state.open) {
document.body.classList.add('is-menu-open');
} else {
document.body.classList.remove('is-menu-open');
}
return ( return (
<nav className="c-menu"> <nav className="c-menu__wrapper open">
<div className="c-menu">
<div className="c-menu__fix">
<div className={"c-menu__container" + (this.state.open === true ? " open": "")}>
<div className="c-menu__body">
<div className="c-menu__fix c-menu__groups">
<MenuGroup title="Get in touch">
<MenuItem to="/contact">Contact Me</MenuItem>
</MenuGroup>
<MenuGroup title="Legal Stuff">
<MenuItem to="/privacy-policy">Privacy Policy</MenuItem>
</MenuGroup>
</div>
</div>
</div>
</div>
</div>
<button type="button" className="c-menu__button" onClick={this.toggleMenu.bind(this)}>
<FontAwesomeIcon icon={faBars} />
</button>
</nav> </nav>
) )
} }
+10 -13
View File
@@ -11,15 +11,14 @@
*/ */
import React from 'react'; import React from 'react';
import { Link, NavLink } from 'react-router-dom';
import Menu from './Menu';
import FontAwesomeIcon from '@fortawesome/react-fontawesome' const NavbarLink = function(props) {
import { faBars } from '@fortawesome/fontawesome-free-solid'
const NavLink = function(props) {
return ( return (
<a href={props.to} className="c-navbar__link"> <NavLink exact to={props.to} className="c-navbar__link" activeClassName="active">
<span className="c-navbar__link-text">{props.children}</span> <span className="c-navbar__link-text">{props.children}</span>
</a> </NavLink>
) )
} }
@@ -31,17 +30,15 @@ class Navbar extends React.Component {
render() { render() {
return ( return (
<nav className="c-navbar"> <nav className="c-navbar">
<button type="button" className="c-navbar__menu-button"> <Menu open />
<FontAwesomeIcon icon={faBars} />
</button>
<a href="#" className="c-navbar__logo-container"> <Link to="/" className="c-navbar__logo-container">
<img src={ require('./../../images/logo.svg') } className="c-navbar__logo" alt="domsPlace" /> <img src={ require('./../../images/logo.svg') } className="c-navbar__logo" alt="domsPlace" />
</a> </Link>
<div className="c-navbar__links"> <div className="c-navbar__links">
<NavLink to="/">Home</NavLink> <NavbarLink exact to="/">Home</NavbarLink>
<NavLink to="/contact">Contact</NavLink> <NavbarLink to="/contact">Contact</NavbarLink>
</div> </div>
</nav> </nav>
) )
+43
View File
@@ -0,0 +1,43 @@
/*
* Contact Page
* Not the Homepage.
*
* Dependencies:
* styles/components/_page--style-contact.scss
*
* Version:
* 1.0.0 - 2018/03/03
*/
import React from 'react';
import Page from './../Page';
import PhoneSection from './../sections/PhoneSection';
import BodySection from './../sections/BodySection';
import ContactForm from './../forms/ContactForm';
class ContactPage extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<Page>
<PhoneSection />
<BodySection>
<h1>Contact</h1>
<div className="c-page--style-container__split">
<p className="c-page--style-container__split-part">
Want to get ahold of me and other lorem ipsum dolor?
</p>
<ContactForm className="c-page--style-container__split-part" />
</div>
</BodySection>
</Page>
)
}
}
export default ContactPage;
+28
View File
@@ -0,0 +1,28 @@
/*
* BlankPromo
* Blank Promo section.
*
* Dependencies:
* styles/components/_section--style-blank-promo.scss
*
* Version:
* 1.0.0 - 2018/02/24
*/
import React from 'react';
import Section from './../Section';
class BlankPromo extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<Section section="blank-promo" full>
</Section>
)
}
}
export default BlankPromo;
@@ -0,0 +1,62 @@
/*
* Poly
* Poly styled section.
*
* Dependencies:
* styles/components/_section--style-phone.scss
*
* Version:
* 1.1.0 - 2018/03/10
*/
import React from 'react';
import ThreeSection from './ThreeSection';
import * as THREE from 'three';
import * as Easing from './../../animation/Easing';
import PhoneModel from './../../3d/phone.json';
class PhoneSection extends React.Component {
constructor(props) {
super(props);
}
onSetup(scene) {
this.loader = new THREE.JSONLoader();
this.data = this.loader.parse(PhoneModel);
this.material = new THREE.MeshLambertMaterial({
color: 0xff66ab
});
this.mesh = new THREE.Mesh(this.data.geometry, this.material);
this.mesh.position.z = 2;
scene.add(this.mesh);
}
getV(j) {
var x = new Date().getTime() % j;
var h = x;
if(x > (j/2)) h = (j/2) - (x - (j/2));
h *= 2;
return Easing.easeInOutQuart(h, 0, 1, j);
}
onRender(diff) {
this.mesh.rotation.set(
THREE.Math.degToRad(this.getV(25000)*5),
THREE.Math.degToRad(this.getV(15000)*10),
THREE.Math.degToRad(this.getV(40000)*20)
);
}
render() {
return (
<ThreeSection
onRender={this.onRender.bind(this)}
onSetup={this.onSetup.bind(this)}
/>
)
}
}
export default PhoneSection;
+12 -58
View File
@@ -8,9 +8,8 @@
* Version: * Version:
* 1.0.0 - 2018/02/24 * 1.0.0 - 2018/02/24
*/ */
import React from 'react'; import React from 'react';
import Section from './../Section'; import ThreeSection from './ThreeSection';
import * as THREE from 'three'; import * as THREE from 'three';
const CUBES = [ const CUBES = [
@@ -57,24 +56,17 @@ class Poly extends React.Component {
super(props); super(props);
} }
componentDidMount() { onSetup(scene) {
if(typeof this.scene !== typeof undefined) return;
this.scene = new THREE.Scene();
this.camera = new THREE.PerspectiveCamera(17, window.innerWidth / window.innerHeight, 0.1, 1000 );
this.isAlive = true;
this.render = new THREE.WebGLRenderer({canvas: this.refs.canvas, alpha: true});
this.render.setSize(window.innerWidth, window.innerHeight);
this.cubes = []; this.cubes = [];
this.outlines = []; this.outlines = [];
for(var i = 0; i < CUBES.length; i++) { for(var i = 0; i < CUBES.length; i++) {
let c = CUBES[i]; let c = CUBES[i];
let geometry = new THREE.BoxGeometry(c.size[0],c.size[1],c.size[2]); let geometry = new THREE.BoxGeometry(c.size[0],c.size[1],c.size[2]);
let material = new THREE.MeshLambertMaterial( { color: c.color } ); let material = new THREE.MeshLambertMaterial( { color: c.color } );
let cube = new THREE.Mesh(geometry, material); let cube = new THREE.Mesh(geometry, material);
cube.position.x = c.pos[0]; cube.position.x = c.pos[0];
cube.position.y = c.pos[1]; cube.position.y = c.pos[1];
cube.position.z = c.pos[2]; cube.position.z = c.pos[2];
@@ -82,7 +74,8 @@ class Poly extends React.Component {
cube.rotation.y = Math.random()*360; cube.rotation.y = Math.random()*360;
cube.rotation.z = Math.random()*360; cube.rotation.z = Math.random()*360;
cube.velocity = c.velocity; cube.velocity = c.velocity;
this.scene.add(cube);
scene.add(cube);
this.cubes.push(cube); this.cubes.push(cube);
if(typeof c.outline !== typeof undefined) { if(typeof c.outline !== typeof undefined) {
@@ -94,50 +87,13 @@ class Poly extends React.Component {
outlineMesh.scale.multiplyScalar(1.05); outlineMesh.scale.multiplyScalar(1.05);
this.outlines[i] = outlineMesh; this.outlines[i] = outlineMesh;
this.scene.add( outlineMesh ); scene.add( outlineMesh );
} }
} }
this.camera.position.z = 5;
this.ambient1 = new THREE.AmbientLight(0xFFCCFF, 0.2);
this.scene.add(this.ambient1);
this.ambient2 = new THREE.AmbientLight(0xFFFFFF, 0.5);
this.scene.add(this.ambient2);
this.light = new THREE.DirectionalLight(0x22BBFF, 0.5);
this.light.position.x = this.camera.position.x;
this.light.position.y = this.camera.position.y;
this.light.position.z = this.camera.position.z + 8;
this.scene.add(this.light);
this.onFrame();
} }
componentWillUnmount() { onRender(diff) {
this.isAlive = false;
}
onFrame() {
if(!this.isAlive) return;
let now = new Date();
let width = this.refs.canvasSpace.clientWidth;
let height = this.refs.canvasSpace.clientHeight;
let diff = now.getTime() - (this.lastTime || new Date()).getTime();
diff = diff / 1000;
let hfov = 95;
let hfovRad = hfov * Math.PI / 180;
let vfovRad = 2*Math.atan(Math.tan(hfovRad/2)*height/width);
this.render.setSize(width, height);
this.camera.aspect = width / height;
this.camera.fov = vfovRad * 180 / Math.PI;
this.camera.updateProjectionMatrix();
requestAnimationFrame(this.onFrame.bind(this));
this.render.render(this.scene, this.camera);
for(var i = 0; i < this.cubes.length; i++) { for(var i = 0; i < this.cubes.length; i++) {
let e = this.cubes[i]; let e = this.cubes[i];
let o = this.outlines[i]; let o = this.outlines[i];
@@ -153,16 +109,14 @@ class Poly extends React.Component {
o.rotation.z = e.rotation.z; o.rotation.z = e.rotation.z;
} }
} }
this.lastTime = now;
} }
render() { render() {
return ( return (
<Section section="poly" full> <ThreeSection
<div className="c-section--style-poly__canvas" ref="canvasSpace"></div> onRender={this.onRender.bind(this)}
<canvas ref="canvas" className="c-section--style-poly__canvas"> onSetup={this.onSetup.bind(this)}
</canvas> />
</Section>
) )
} }
} }
@@ -0,0 +1,91 @@
/*
* ThreeJS Section
* Section for Three JS.
*
* Version:
* 1.0.0 - 2018/03/10
*/
import React from 'react';
import Section from './../Section';
import * as THREE from 'three';
class ThreeSection extends React.Component {
constructor(props) {
super(props);
}
componentDidMount() {
if(typeof this.scene !== typeof undefined) return;
this.scene = new THREE.Scene();
this.camera = new THREE.PerspectiveCamera(17, window.innerWidth / window.innerHeight, 0.1, 1000 );
this.isAlive = true;
this.render = new THREE.WebGLRenderer({canvas: this.refs.canvas, alpha: true});
this.render.setSize(window.innerWidth, window.innerHeight);
this.camera.position.z = 5;
this.ambient1 = new THREE.AmbientLight(0xFFCCFF, 0.2);
this.scene.add(this.ambient1);
this.ambient2 = new THREE.AmbientLight(0xFFFFFF, 0.5);
this.scene.add(this.ambient2);
this.light = new THREE.DirectionalLight(0x22BBFF, 0.5);
this.light.position.x = this.camera.position.x;
this.light.position.y = this.camera.position.y;
this.light.position.z = this.camera.position.z + 8;
this.scene.add(this.light);
if(typeof this.props.onSetup !== typeof undefined) {
this.props.onSetup(this.scene, this.camera, this.renderer);
}
this.onFrame();
}
componentWillUnmount() {
this.isAlive = false;
}
onFrame() {
if(!this.isAlive) return;
let now = new Date();
let width = this.refs.canvasSpace.clientWidth;
let height = this.refs.canvasSpace.clientHeight;
let diff = now.getTime() - (this.lastTime || new Date()).getTime();
diff = diff / 1000;
let hfov = 95;
let hfovRad = hfov * Math.PI / 180;
let vfovRad = 2*Math.atan(Math.tan(hfovRad/2)*height/width);
this.render.setSize(width, height);
this.render.setPixelRatio(window.devicePixelRatio);
this.camera.aspect = width / height;
this.camera.fov = vfovRad * 180 / Math.PI;
this.camera.updateProjectionMatrix();
requestAnimationFrame(this.onFrame.bind(this));
if(typeof this.props.onRender !== typeof undefined) {
this.props.onRender(diff);
}
this.render.render(this.scene, this.camera);
this.lastTime = now;
}
render() {
return (
<Section section="three" full>
<div className="c-section--style-three__canvas" ref="canvasSpace"></div>
<canvas ref="canvas" className="c-section--style-three__canvas">
</canvas>
</Section>
)
}
}
export default ThreeSection;
+13 -1
View File
@@ -4,10 +4,22 @@ import 'babel-polyfill';
import React from 'react'; import React from 'react';
import ReactDOM, { render } from 'react-dom'; import ReactDOM, { render } from 'react-dom';
import { createStore, applyMiddleware } from 'redux';
import { Provider } from 'react-redux';
import App from './App.jsx'; import App from './App.jsx';
import Styles from './styles/index.scss'; import Styles from './styles/index.scss';
import rootReducer from './reducers/rootReducer';
//Create our store
const store = createStore(rootReducer);
const unsubscribe = store.subscribe(() => {
console.log(store.getState());
});
//Render app and supply provider for store.
render(( render((
<App /> <Provider store={store}>
<App />
</Provider>
), document.getElementById("app")); ), document.getElementById("app"));
+22
View File
@@ -0,0 +1,22 @@
import enAU from './en-AU.jsx';
const LANGUAGES = {
'en-AU': enAU
}
class Language {
constructor() {
this.setLanguage("en-AU");
}
setLanguage(lang) {
this.data = LANGUAGES[lang];
}
get(key) {
}
}
const lang = new Language();
export default lang;
+3
View File
@@ -0,0 +1,3 @@
module.exports = {
""
}
+12
View File
@@ -0,0 +1,12 @@
'use strict';
import {combineReducers} from 'redux';
//Import Reducers
//Create our Reducer
const rootReducer = combineReducers({
});
//Export the root reducer
export default rootReducer;
+1
View File
@@ -14,6 +14,7 @@
.c-app { .c-app {
width: 100%; width: 100%;
height: 100%; height: 100%;
min-height: 100vh;
overflow-x: hidden; overflow-x: hidden;
position: relative; position: relative;
} }
+9 -3
View File
@@ -10,15 +10,21 @@
* Version: * Version:
* 1.0.0 - 2018/03/03 * 1.0.0 - 2018/03/03
*/ */
$c-footer--text-color: black; $c-footer--text-color: $s-color--text;
$c-footer--background-color: white; $c-footer--background-color: $s-color--background-default;
.c-footer__ghost {
margin-top: 5em;
min-height: 3em;
}
.c-footer { .c-footer {
margin-top: 5em;
width: 100%; width: 100%;
background: $c-footer--background-color; background: $c-footer--background-color;
@extend %t-flexbox; @extend %t-flexbox;
@include t-flex-wrap(wrap); @include t-flex-wrap(wrap);
position: absolute;
bottom: 0;
} }
.c-footer__copyright { .c-footer__copyright {
+35
View File
@@ -0,0 +1,35 @@
/*
* Form
* Styles for form elements
*
* Dependencies:
*
* Version:
* 1.0.0 - 2018/03/07
*/;
$c-form--shadow-offset: 5px;
.c-form {
}
.c-form__label {
display: block;
padding-bottom: 0.25em;
}
.c-form__group {
margin-bottom: 1.5em;
}
//Form input
.c-form-input {
width: 400px;
max-width: 100%;
border: $s-color--border--default;
padding: 0.5em;
@include t-box-shadow(-$c-form--shadow-offset, $c-form--shadow-offset, 0px, rgba(0, 0, 0, 0.5));
}
.c-form-input--multiline {
min-height: 10em;
}
+105 -2
View File
@@ -3,10 +3,113 @@
* Styles for the menu * Styles for the menu
* *
* Dependencies: * Dependencies:
* styles/settings/animation.scss
* styles/settings/responsive.scss
* styles/tools/_mixin.absolute-centering.scss
* *
* Version: * Version:
* 1.0.0 - 2018/03/01 * 1.0.0 - 2018/03/04
*/ */
.c-menu { $c-menu--z-index: 1000;
$c-menu--button--z-index: $c-menu--z-index + 10;
$c-menu--list--z-index: $c-menu--z-index + 20;
body.is-menu-open {
overflow: hidden;
}
.c-menu__wrapper {
position: relative; position: relative;
} }
.c-menu__button {
font-size: 1.5em;
padding: 0.5em 0.75em;
position: relative;
z-index: $c-menu--button--z-index;
}
.c-menu {
position: absolute;
top: 50%;
left: 50%;
border-left: 1px solid red;
}
.c-menu__fix {
position: relative;
}
.c-menu__container {
@extend %t-absolute-center-x-y;
width: 0px;
height: 0px;
border-radius: 50%;
z-index: $c-menu--z-index;
background: white;
overflow: hidden;
transition:
width 0.2s $s-animation--ease-out-curve,
height 0.2s $s-animation--ease-out-curve,
;
&.open {
width: 250vmax;
height: 250vmax;
}
}
.c-menu__body {
position: absolute;
top: 50%;
left: 50%;
z-index: $c-menu--list--z-index;
}
.c-menu__groups {
@extend %t-flexbox;
@include t-flex-wrap(wrap);
/*position: absolute;
left: 2em;
top: -1.5em;*/
top: 0l;
width: 100vw;
height: 100vh;
position: fixed;
overflow-y: auto;
}
.c-menu__group {
padding: 1em;
width: 100%;
}
.c-menu__group-title {
}
.c-menu__item {
display: block;
}
@include t-media-query($s-xsmall-up) {
.c-menu__button {
padding: 0.75em 1em;
}
.c-menu__group {
width: 50%;
}
}
@include t-media-query($s-medium-up) {
.c-menu__group {
width: (100% / 3);
}
}
@include t-media-query($s-large-up) {
.c-menu__group {
width: 25%;
}
}
+13 -22
View File
@@ -14,8 +14,7 @@
* 1.0.0 - 2018/02/23 * 1.0.0 - 2018/02/23
*/ */
$c-navbar--z-index: 100; $c-navbar--z-index: 100;
$c-navbar--link-border: $s-border--default; $c-navbar--background: $s-color--background-default;
$c-navbar--background: white;
$c-navbar--link-offset: 5px; $c-navbar--link-offset: 5px;
.c-navbar { .c-navbar {
@@ -29,12 +28,6 @@ $c-navbar--link-offset: 5px;
@extend %t-flexbox; @extend %t-flexbox;
} }
//Menu Button
.c-navbar__menu-button {
font-size: 1.5em;
padding: 0.5em 0.75em;
}
//Logo //Logo
.c-navbar__logo-container { .c-navbar__logo-container {
@include t-align-self(center); @include t-align-self(center);
@@ -51,27 +44,26 @@ $c-navbar--link-offset: 5px;
width: 100%; width: 100%;
text-align: right; text-align: right;
display: none; display: none;
@include t-justify-content(flex-end);
} }
.c-navbar__link { .c-navbar__link {
@extend %s-font--navigation; @extend %s-font--navigation;
height: 100%;
font-size: 1.2em; font-size: 1.2em;
padding: 0 1.5em; padding: 0 1.5em;
display: inline-table;
@extend %t-inline-flex;
@include t-align-items(center);
&.active {
border-bottom: $s-thickness--border-thick solid $s-color--links;
}
} }
.c-navbar__link-text { .c-navbar__link-text {
display: table-cell; //vertical-align: middle;
vertical-align: middle;
}
//Responsive queries
@include t-media-query($s-xsmall-up) {
.c-navbar__menu-button {
font-size: 2em;
}
} }
@include t-media-query($s-small-up) { @include t-media-query($s-small-up) {
@@ -83,12 +75,11 @@ $c-navbar--link-offset: 5px;
} }
.c-navbar__links { .c-navbar__links {
displaY: block; @include t-flexbox;
} }
.c-navbar__link { .c-navbar__link {
background: $s-color--background-default;
background: white;
transition: all 0.2s $s-animation--ease-out-curve; transition: all 0.2s $s-animation--ease-out-curve;
margin-left: $c-navbar--link-offset; margin-left: $c-navbar--link-offset;
@include t-translate(0em, 0em); @include t-translate(0em, 0em);
@@ -0,0 +1,32 @@
/*
* Contact Page
* Styles for page elements
*
* Dependencies:
* styles/settings/responsive.scss
* styles/tools/_repsonsive.scss
* styles/tools/_flex.scss
* styles/components/_style.scss
*
* Version:
* 1.0.0 - 2018/03/10
*/
.c-page--style-contact {
}
.c-page--style-container__split {
@extend %t-flexbox;
@include t-flex-wrap(wrap);
}
.c-page--style-container__split-part {
width: 100%;
}
@include t-media-query($s-small-up) {
.c-page--style-container__split {
@include t-flex-wrap(nowrap);
}
}
@@ -0,0 +1,12 @@
/*
* Blank Promo Section Style
* Styles for blank promo style section
*
* Dependencies:
*
* Version:
* 1.0.0 - 2018/02/28
*/
.c-section--style-blank-promo {
height: 30vmin;
}
@@ -18,6 +18,7 @@
@include t-media-query($s-small-up) { @include t-media-query($s-small-up) {
.c-section--style-body { .c-section--style-body {
margin-left: 4%; margin-left: 4%;
width: 96%;
@include t-box-shadow(-10px, 10px, 0px, rgba(0, 0, 0, 0.5)); @include t-box-shadow(-10px, 10px, 0px, rgba(0, 0, 0, 0.5));
} }
} }
@@ -8,18 +8,3 @@
* Version: * Version:
* 1.0.0 - 2018/02/28 * 1.0.0 - 2018/02/28
*/ */
.c-section--style-poly {
height: 60vmin;
position: relative;
z-index: -1;
overflow-y: visible;
}
.c-section--style-poly__canvas {
width: 100%;
height: 100%;
height: 80vmin;
top: 0;
left: 0;
position: absolute;
}
@@ -0,0 +1,25 @@
/*
* Section Style Three
* Styles for Three JS section elements
*
* Dependencies:
* styles/components/_section.scss
*
* Version:
* 1.0.0 - 2018/02/28
*/
.c-section--style-three {
height: 60vmin;
position: relative;
z-index: -1;
overflow-y: visible;
}
.c-section--style-three__canvas {
width: 100%;
height: 100%;
height: 80vmin;
top: 0;
left: 0;
position: absolute;
}
+7
View File
@@ -22,6 +22,8 @@
@import './tools/_responsive.scss'; @import './tools/_responsive.scss';
@import './tools/_transform.scss'; @import './tools/_transform.scss';
@import './tools/_mixin.absolute-centering.scss';
//Resets //Resets
@import './../../node_modules/normalize.css/normalize.css'; @import './../../node_modules/normalize.css/normalize.css';
@@ -35,17 +37,22 @@
@import './elements/_table.scss'; @import './elements/_table.scss';
//Objects //Objects
@import './objects/_button.scss';
//Components //Components
@import './components/_app.scss'; @import './components/_app.scss';
@import './components/_footer.scss'; @import './components/_footer.scss';
@import './components/_form.scss';
@import './components/_header.scss'; @import './components/_header.scss';
@import './components/_menu.scss'; @import './components/_menu.scss';
@import './components/_navbar.scss'; @import './components/_navbar.scss';
@import './components/_page.scss'; @import './components/_page.scss';
@import './components/_page--style-contact.scss';
@import './components/_section.scss'; @import './components/_section.scss';
@import './components/_section--style-blank-promo.scss';
@import './components/_section--style-body.scss'; @import './components/_section--style-body.scss';
@import './components/_section--style-poly.scss'; @import './components/_section--style-poly.scss';
@import './components/_section--style-three.scss';
//Utilities //Utilities
+35
View File
@@ -0,0 +1,35 @@
/*
* Form
* Styles for form elements
*
* Dependencies:
*
* Version:
* 1.0.0 - 2018/03/07
*/
$c-button--shadow-offset: 5px;
$c-button--background: white;
$c-button--border: $s-color--border--default;
$c-button--text: $s-color--text;
.o-button {
display: inline-block;
padding: 0.5em 1em;
border: $c-button--border;
@include t-box-shadow(-$c-button--shadow-offset, $c-button--shadow-offset, 0px, rgba(0, 0, 0, 0.5));
background: $c-button--background;
text-decoration: none;
color: $c-button--text;
transition: all 0.1s $s-animation--ease-out-curve;
&:hover {
text-decoration: none;
color: $c-button--text;
@include t-box-shadow(-0, 0, 0px, rgba(0, 0, 0, 0.5));
@include t-transform(translate(-$c-button--shadow-offset, $c-button--shadow-offset))
}
~ .o-button {
margin-left: $c-button--shadow-offset * 2;
}
}
+5 -3
View File
@@ -11,12 +11,14 @@
//Fonts //Fonts
$s-color--text: black; $s-color--text: black;
$s-color--links: #FC78DE; $s-color--links: #FC78DE;
$s-color--links-hover: lighten($s-color--links, 20%); $s-color--links-hover: $s-color--links;
//Backgrounds //Backgrounds
$s-color--background-default: white; $s-color--background-default: #FEFCF8;
$s-color--background-top: #2BF; $s-color--background-top: #2BF;
$s-color--background-bottom: #FCF; $s-color--background-bottom: #FCF;
//Borders //Borders
$s-border--default: 1px solid #DDD; $s-thickness--border-default: 1px;
$s-thickness--border-thick: 3px;
$s-color--border--default: $s-thickness--border-default solid #DDD;
@@ -0,0 +1,40 @@
/*
* Absolute Position Centering
* Provides mixins to center using absolute positioning and transforms
*
* Dependencies:
* tools/_mixin.transform.scss
*
* Version:
* 1.0.0 - 2018/01/29
*/
@mixin t-absolute-center-x-y() {
position: absolute;
left: 50%;
top: 50%;
@include t-translate(-50%, -50%);
}
@mixin t-absolute-center-x() {
position: absolute;
left: 50%;
@include t-translate-x(-50%);
}
@mixin t-absolute-center-y() {
position: absolute;
top: 50%;
@include t-translate-y(-50%);
}
%t-absolute-center-x-y {
@include t-absolute-center-x-y();
}
%t-absolute-center-x {
@include t-absolute-center-x();
}
%t-absolute-center-y {
@include t-absolute-center-y();
}