Skip to content

Commit

Permalink
Push final before Netlify deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
“Jim” committed Aug 9, 2022
1 parent 33ff781 commit cbb2e0e
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 62 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ yarn-debug.log*
yarn-error.log*

NOTES.md
MISC.md
src/assets
4 changes: 0 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ This is personal project since I practice bushcraft and wilderness survival tech

IMPORTANT TO-DO's:

1. **MERGE BRANCH TO MASTER LOCALLY**
1. Need US and Metric radio buttons on the form
1. The import of all the tarp designs in Configs.js to get the `src` to work - have to find a better way
1. Why doesn't my img src work in Configs.js?
1. useEffect **cleanup!!!** - yes, stop the focus when you are on another page? https://dmitripavlutin.com/react-useref-guide/ -
1. A page reload loses state and therefore `/configs` content - `localStorage`?
1. Double check the 2 angles for all Side-Wall LT and Holden Tent configs.
1. Double check Miners tent constants since it has 3D geometry (Geek37).
Expand All @@ -40,8 +38,6 @@ LESS IMPORTANT TO DO:

1. button colors change?
1. Consider adding _Half-Pyramid_ and _Forest Tent_ into A-Frame category, and _Trapezoid_ and _Tetra_ into Tents. Which means I need to add 1-2 more in Lean-To (Envelope?) and Diagonal (Octagon? Forrester? Bivi Bag Cornet)
1. no DaisyUI clsses? `npm uninstall daisyui`?
1. added Config.js as a ES6 class - why? Where? Must have deleted it.

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion src/components/ConfigArrowhead.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext } from "react";
import TarpContext from "../TarpContext";
import { FaTimes, FaCheck } from "react-icons/fa";

import ArrowheadImg from "../assets/images/Arrow_Wedge.png";
import ArrowheadImg from "../assets/images/ArrowWedge2.png";

function Config_Arrowhead() {
const state = useContext(TarpContext);
Expand Down
38 changes: 19 additions & 19 deletions src/pages/Configs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ import AllConfigs from "../data/AllConfigs";
import ConfigTypes from "../data/ConfigTypes";
import ScrollToTop from "../components/ScrollToTop";

import ltfold0 from "../assets/images/Fold_LT.png";
import ltfold1 from "../assets/images/Fold_FRLT50.png";
import ltfold2 from "../assets/images/Fold_FRLT33.png";
import ltfold3 from "../assets/images/Fold_FRLT25.png";
import ltfold4 from "../assets/images/Fold_FRCFly.png";
import ltfold5 from "../assets/images/Fold_BWLT25.png";
import ltfold6 from "../assets/images/Fold_BWLT33.png";
import ltfold7 from "../assets/images/Fold_BWFRLT25.png";
import ltfold8 from "../assets/images/Fold_BWFRLT33.png";
import swaf25 from "../assets/images/Fold_SWAF25.png";
import swaf33 from "../assets/images/Fold_SWAF33.png";
import diamond from "../assets/images/Fold_DiaPP.png";
import adirondack from "../assets/images/Fold_Adir.png";
import hexd from "../assets/images/Fold_HexD.png";
import arrowhead from "../assets/images/Fold_Arrow.png";
import swlt from "../assets/images/Fold_SWLT.png";
import holden from "../assets/images/Fold_Holden.png";
import miners from "../assets/images/Fold_Miners.png";
import bakers from "../assets/images/Fold_Bakers.png";
import ltfold0 from "../assets/images/FoldLT.png";
import ltfold1 from "../assets/images/FoldFRLT50.png";
import ltfold2 from "../assets/images/FoldFRLT33.png";
import ltfold3 from "../assets/images/FoldFRLT25.png";
import ltfold4 from "../assets/images/FoldFRCFly.png";
import ltfold5 from "../assets/images/FoldBWLT25.png";
import ltfold6 from "../assets/images/FoldBWLT33.png";
import ltfold7 from "../assets/images/FoldBWFRLT25.png";
import ltfold8 from "../assets/images/FoldBWFRLT33.png";
import swaf25 from "../assets/images/FoldSWAF25.png";
import swaf33 from "../assets/images/FoldSWAF33.png";
import diamond from "../assets/images/FoldDiaPP.png";
import adirondack from "../assets/images/FoldAdir.png";
import hexd from "../assets/images/FoldHexD.png";
import arrowhead from "../assets/images/FoldArrow.png";
import swlt from "../assets/images/FoldSWLT.png";
import holden from "../assets/images/FoldHolden.png";
import miners from "../assets/images/FoldMiners.png";
import bakers from "../assets/images/FoldBakers.png";

const leantoimages = [ltfold0, ltfold1, ltfold2, ltfold3, ltfold4, ltfold5, ltfold6, ltfold7, ltfold8];
const aframeimages = [ltfold1, ltfold2, ltfold3, swaf25, swaf33, ltfold4, ltfold4, ltfold4];
Expand Down
74 changes: 37 additions & 37 deletions src/pages/Results.js
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import React, { useContext, useState } from "react";
import React, { useContext } from "react";
import { HashLink as Link } from "react-router-hash-link";
import TarpContext from "../TarpContext";
import ScrollToTop from "../components/ScrollToTop";

import Config_LT from "../components/ConfigLT";
import Config_FR from "../components/ConfigFR";
import Config_BWFR from "../components/ConfigBWFR";
import Config_AF from "../components/ConfigAF";
import Config_SWAF from "../components/ConfigSWAF";
import Config_OS from "../components/ConfigOS";
import Config_TT from "../components/ConfigTT";
import Config_FR_CFly from "../components/ConfigFRCFly";
import Config_AF_CFly from "../components/ConfigAFCFly";
import Config_Dia from "../components/ConfigDia";
import Config_HexDia from "../components/ConfigHexDia";
import Config_Arrowhead from "../components/ConfigArrowhead";
import Config_PP from "../components/ConfigPP";
import Config_Adir from "../components/ConfigAdir";
import Config_SWLT from "../components/ConfigSWLT";
import Config_Lavvu from "../components/ConfigLavvu";
import Config_Miners from "../components/ConfigMiners";
import Config_Bakers from "../components/ConfigBakers";
import ConfigLT from "../components/ConfigLT";
import ConfigFR from "../components/ConfigFR";
import ConfigBWFR from "../components/ConfigBWFR";
import ConfigAF from "../components/ConfigAF";
import ConfigSWAF from "../components/ConfigSWAF";
import ConfigOS from "../components/ConfigOS";
import ConfigTT from "../components/ConfigTT";
import ConfigFRCFly from "../components/ConfigFRCFly";
import ConfigAFCFly from "../components/ConfigAFCFly";
import ConfigDia from "../components/ConfigDia";
import ConfigHexDia from "../components/ConfigHexDia";
import ConfigArrowhead from "../components/ConfigArrowhead";
import ConfigPP from "../components/ConfigPP";
import ConfigAdir from "../components/ConfigAdir";
import ConfigSWLT from "../components/ConfigSWLT";
import ConfigLavvu from "../components/ConfigLavvu";
import ConfigMiners from "../components/ConfigMiners";
import ConfigBakers from "../components/ConfigBakers";

function Results() {
const state = useContext(TarpContext);
Expand Down Expand Up @@ -63,10 +63,10 @@ function Results() {
<div className="bg-img lt-bg-img">
<h2 className="config-heading text-3xl m-6 text-teal-700 font-semibold text-center sm:text-4xl">Lean-To Configurations</h2>
</div>
<Config_LT />
<Config_FR />
<Config_FR_CFly />
<Config_BWFR />
<ConfigLT />
<ConfigFR />
<ConfigFRCFly />
<ConfigBWFR />
<p className="mt-1 text-center">
Go to{" "}
<Link to="/configs#lean-to-configuration" className="font-bold text-blue-600 hover:text-blue-800 hover:underline hover:underline-offset-2">
Expand All @@ -79,11 +79,11 @@ function Results() {
<div className="bg-img af-bg-img">
<h2 className="config-heading text-3xl m-6 text-teal-700 font-semibold text-center sm:text-4xl">A-Frame Configurations</h2>
</div>
<Config_AF />
<Config_AF_CFly />
<Config_SWAF />
<Config_OS />
<Config_TT />
<ConfigAF />
<ConfigAFCFly />
<ConfigSWAF />
<ConfigOS />
<ConfigTT />
<p className="mt-2 text-center">
Go to{" "}
<Link to="/configs#aframe-configuration" className="font-bold text-blue-600 hover:text-blue-800 hover:underline hover:underline-offset-2">
Expand All @@ -96,11 +96,11 @@ function Results() {
<div className="bg-img diag-bg-img">
<h2 className="config-heading text-3xl m-6 text-teal-700 font-semibold text-center sm:text-4xl">Diagonal Configurations</h2>
</div>
<Config_Dia />
<Config_HexDia />
<Config_Arrowhead />
<Config_PP />
<Config_Adir />
<ConfigDia />
<ConfigHexDia />
<ConfigPP />
<ConfigArrowhead />
<ConfigAdir />
<p className="mt-6 text-center">
Go to{" "}
<Link to="/configs#diagonal-configuration" className="font-bold text-blue-600 hover:text-blue-800 hover:underline hover:underline-offset-2">
Expand All @@ -113,10 +113,10 @@ function Results() {
<div className="bg-img tent-bg-img">
<h2 className="config-heading text-3xl m-6 text-teal-700 font-semibold text-center sm:text-4xl">Tent Configurations</h2>
</div>
<Config_SWLT />
<Config_Lavvu />
<Config_Miners />
<Config_Bakers />
<ConfigSWLT />
<ConfigLavvu />
<ConfigMiners />
<ConfigBakers />
<p className="mt-3 text-center">
Go to{" "}
<Link to="/configs#tent-configuration" className="font-bold text-blue-600 hover:text-blue-800 hover:underline hover:underline-offset-2">
Expand Down

0 comments on commit cbb2e0e

Please sign in to comment.