Skip to content

Commit 75b1802

Browse files
GingerKiwiGingerKiwi
committed
add knit scarf data to data.js. uncomment out scarf code in howmuchyarn.html
1 parent e72ff32 commit 75b1802

File tree

4 files changed

+80
-45
lines changed

4 files changed

+80
-45
lines changed

‎Docs-YarnHelp3/.obsidian/workspace.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111
"id": "3ccbdb1ec088c883",
1212
"type": "leaf",
1313
"state": {
14-
"type": "markdown",
14+
"type": "pdf",
1515
"state": {
16-
"file": "YarnHelp2-Docs/Calculations.md",
17-
"mode": "source",
18-
"source": false
16+
"file": "YarnHelp2-Docs/PDF-References/CYC_YarnStandards-2018-11-06.pdf"
1917
}
2018
}
2119
}
@@ -85,7 +83,7 @@
8583
"state": {
8684
"type": "backlink",
8785
"state": {
88-
"file": "YarnHelp2-Docs/Calculations.md",
86+
"file": "YarnHelp2-Docs/PDF-References/CYC_YarnStandards-2018-11-06.pdf",
8987
"collapseAll": false,
9088
"extraContext": false,
9189
"sortOrder": "alphabetical",
@@ -102,7 +100,7 @@
102100
"state": {
103101
"type": "outgoing-link",
104102
"state": {
105-
"file": "YarnHelp2-Docs/Calculations.md",
103+
"file": "YarnHelp2-Docs/PDF-References/CYC_YarnStandards-2018-11-06.pdf",
106104
"linksCollapsed": false,
107105
"unlinkedCollapsed": true
108106
}
@@ -125,7 +123,7 @@
125123
"state": {
126124
"type": "outline",
127125
"state": {
128-
"file": "YarnHelp2-Docs/Calculations.md"
126+
"file": "YarnHelp2-Docs/PDF-References/CYC_YarnStandards-2018-11-06.pdf"
129127
}
130128
}
131129
}
@@ -148,11 +146,11 @@
148146
},
149147
"active": "3ccbdb1ec088c883",
150148
"lastOpenFiles": [
149+
"YarnHelp2-Docs/Calculations.md",
151150
"YarnHelp2-Docs/notes.md",
152151
"YardageNeeded-Scarfs.md",
153152
"Yardage Needed - Pullovers.md",
154153
"YardageNeeded-Pullovers.md",
155-
"YarnHelp2-Docs/Calculations.md",
156154
"YarnHelp2-Docs/Readme1.0.md",
157155
"YarnHelp2-Docs/PDF-References/How Much Yarn Do I Need – TwistedYarnShop.pdf",
158156
"YarnHelp2-Docs/PDF-References/How Much Yarn Do I Need for a Knitted Sweater - Interweave.pdf",

‎data.js

+57-24
Original file line numberDiff line numberDiff line change
@@ -105,30 +105,6 @@ export const pulloverData = {
105105
};
106106

107107

108-
/** @type {ProjectType} */
109-
export const scarfData = {
110-
fingering01: {
111-
name: "Fingering 01",
112-
yardageNeeded: {
113-
childScarf: 250 * 2,
114-
adultSmallScarf: 409 * 2,
115-
adultLargeScarf: 534 * 2,
116-
adultExtraLongScarf: 667 * 2,
117-
doctorWhoScarf: 1260 * 2,
118-
}
119-
},
120-
worsted04: {
121-
name: "Worsted 04",
122-
yardageNeeded: {
123-
childScarf: 250,
124-
adultSmallScarf: 409,
125-
adultLargeScarf: 534,
126-
adultExtraLongScarf: 667,
127-
doctorWhoScarf: 1260,
128-
}
129-
},
130-
};
131-
132108
/** @type {ProjectTypeCrochet} */
133109
export const pulloverCrochetData = {
134110
lace00: {
@@ -191,6 +167,7 @@ export const pulloverCrochetData = {
191167
yardageNeededCrochet: {
192168
// babyPullover: null,
193169
// It doesn't make sense to make a baby pullover with chunky yarn.
170+
babyPulloverCrochet: 450 * 1.25,
194171
toddlerPulloverCrochet: 650 * 1.25,
195172
childPulloverCrochet: 1000 * 1.25,
196173
adultSmallPulloverCrochet: 1200 * 1.25,
@@ -200,3 +177,59 @@ export const pulloverCrochetData = {
200177
}
201178
};
202179

180+
// ----------------------------------------------------
181+
// -------- SCARFS ----------
182+
183+
/** @type {ProjectType} */
184+
export const scarfData = {
185+
fingering01: {
186+
name: "Fingering 01",
187+
yardageNeeded: {
188+
childScarf: (5 * 60 * (32/4))/6,
189+
adultSmallScarf: ( 7 * 70 * (32/4))/6,
190+
adultLargeScarf: ( 8 * 80 * (32/4))/6,
191+
adultExtraLongScarf: ( 8 * (32/4))/6,
192+
doctorWhoScarf: ( 10.5 * 114 * (32/4))/6,
193+
}
194+
},
195+
sport02: {
196+
name: "Sport 02",
197+
yardageNeeded: {
198+
childScarf: (5 * 60 * (26/4))/6,
199+
adultSmallScarf: ( 7 * 70 * (26/4))/6,
200+
adultLargeScarf: ( 8 * 80 * (26/4))/6,
201+
adultExtraLongScarf: ( 8 * (26/4))/6,
202+
doctorWhoScarf: ( 10.5 * 114 * (26/4))/6,
203+
}
204+
},
205+
dk03: {
206+
name: "DK 03",
207+
yardageNeeded: {
208+
childScarf: (5 * 60 * (24/4))/6,
209+
adultSmallScarf: ( 7 * 70 * (24/4))/6,
210+
adultLargeScarf: ( 8 * 80 * (24/4))/6,
211+
adultExtraLongScarf: ( 8 * (24/4))/6,
212+
doctorWhoScarf: ( 10.5 * 114 * (24/4))/6,
213+
}
214+
},
215+
worsted04: {
216+
name: "Worsted 04",
217+
yardageNeeded: {
218+
childScarf: (5 * 60 * (20/4))/6,
219+
adultSmallScarf: ( 7 * 70 * (20/4))/6,
220+
adultLargeScarf: ( 8 * 80 * (20/4))/6,
221+
adultExtraLongScarf: ( 8 * (20/4))/6,
222+
doctorWhoScarf: ( 10.5 * 114 * (20/4))/6,
223+
}
224+
},
225+
bulky05: {
226+
name: "Bulky 05",
227+
yardageNeeded: {
228+
childScarf: (5 * 60 * (15/4))/6,
229+
adultSmallScarf: ( 7 * 70 * (15/4))/6,
230+
adultLargeScarf: ( 8 * 80 * (15/4))/6,
231+
adultExtraLongScarf: ( 8 * (15/4))/6,
232+
doctorWhoScarf: ( 10.5 * 114 * (15/4))/6,
233+
}
234+
},
235+
};

‎howmuchyarn.html

+11-12
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,8 @@ <h3 class="card__title">Knit Sweaters/<wbr/>Jumpers</h3>
149149

150150
<div class="card">
151151
<h3 class="card__title">Crochted Sweaters/<wbr/>Jumpers</h3>
152-
<p>
153-
Coming soon!
154-
</p>
155-
<p>
156-
You can multiply the number of balls of yarn needed for a knit sweater by 1.25 and round up to the nearest whole ball.
157-
</p>
158-
<!-- <p>You will need <span class="babyPulloverCrochet">__</span> balls of yarn for a baby pullover crochet sweater.</p>
152+
153+
<p>You will need <span class="babyPulloverCrochet">__</span> balls of yarn for a baby pullover crochet sweater.</p>
159154

160155
<p>You will need <span class="toddlerPulloverCrochet">__</span> balls of yarn for a toddler pullover crochet sweater.</p>
161156

@@ -165,29 +160,33 @@ <h3 class="card__title">Crochted Sweaters/<wbr/>Jumpers</h3>
165160

166161
<p>You will need <span class="adultLargePulloverCrochet">__</span> balls of yarn for an adult medium to large pullover crochet sweater.</p>
167162

168-
<p>You will need <span class="adultXxlPulloverCrochet">__</span> balls of yarn for an adult XL to XXL pullover crochet sweater.</p> -->
163+
<p>You will need <span class="adultXxlPulloverCrochet">__</span> balls of yarn for an adult XL to XXL pullover crochet sweater.</p>
169164
</div>
170165

166+
<!-- SCARFS -->
171167
<div class="card">
172168
<h3 class="card__title">Scarfs</h3>
173-
<p>Coming soon!</p>
169+
<!-- <p>Coming soon!</p>
174170
175171
<p><a href="https://yarnhelp2.netlify.app/howmuchyarn.html" target="_blank">Link to Yarn Help 2.0 How Much Yarn Page.</a> </p>
176172
177173
<p>
178174
This calculataes how many balls of yarn you need for scarfs and blankets made with worsted weight 04 (medium) thickness yarn.
179175
180-
</p>
181-
<!-- <p>You will need <span class="childScarf">__</span> balls of yarn for a child's scarf.</p>
176+
</p> -->
177+
<p>You will need <span class="childScarf">__</span> balls of yarn for a child's scarf.</p>
182178

183179
<p>You will need <span class="adultSmallScarf">__</span> balls of yarn for a adult's small scarf.</p>
184180

185181
<p>You will need <span class="adultLargeScarf">__</span> balls of yarn for a adult's large scarf.</p>
186182

187183
<p>You will need <span class="adultExtraLongScarf">__</span> balls of yarn for a adult's extra large scarf.</p>
188184

189-
<p>You will need <span class="doctorWhoScarf">__</span> balls of yarn for a Doctor Who scarf.</p> -->
185+
<p>You will need <span class="doctorWhoScarf">__</span> balls of yarn for a Doctor Who scarf.</p>
190186
</div>
187+
188+
189+
<!-- BLANKETS AND THROWS -->
191190
<div class="card">
192191
<h3 class="card__title">Blankets and Throws</h3>
193192
<p>

‎howmuchyarn.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ howMuchYarnFrom.addEventListener('submit', function(evt) {
4646
const formValues = Object.fromEntries(formData.entries());
4747

4848
renderMessageHtml(pulloverData, formValues);
49+
renderMessageHtmlCrochet(pulloverCrochetData, formValues);
50+
4951
renderMessageHtml(scarfData, formValues);
50-
renderMessageHtmlCrochet(pulloverCrochetData, formValues)
52+
// renderMessageHtml(scarfDataCrochet, formValues);
53+
54+
// renderMessageHtml(blanketData, formValues);
55+
// renderMessageHtml(blanketDataCrochet, formValues);
5156
});

0 commit comments

Comments
 (0)