diff --git a/.eslintcache b/.eslintcache deleted file mode 100644 index 80acea3..0000000 --- a/.eslintcache +++ /dev/null @@ -1 +0,0 @@ -[{"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\index.tsx":"1","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\reportWebVitals.ts":"2","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\App.tsx":"3","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Header.tsx":"4","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Home.tsx":"5","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Main.tsx":"6","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Contact.tsx":"7","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Resume.tsx":"8","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\ProjectGrid.tsx":"9","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\cusotmHooks.ts":"10","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Footer.tsx":"11","C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\AboutMe.tsx":"12"},{"size":579,"mtime":1609726036012,"results":"13","hashOfConfig":"14"},{"size":440,"mtime":1609726036016,"results":"15","hashOfConfig":"14"},{"size":384,"mtime":1609726035985,"results":"16","hashOfConfig":"14"},{"size":1336,"mtime":1609807151229,"results":"17","hashOfConfig":"14"},{"size":221,"mtime":1609807151240,"results":"18","hashOfConfig":"14"},{"size":420,"mtime":1609807160871,"results":"19","hashOfConfig":"14"},{"size":142,"mtime":1609726035985,"results":"20","hashOfConfig":"14"},{"size":115,"mtime":1609807173240,"results":"21","hashOfConfig":"14"},{"size":9326,"mtime":1609807151251,"results":"22","hashOfConfig":"14"},{"size":1072,"mtime":1609462531624,"results":"23","hashOfConfig":"14"},{"size":1238,"mtime":1609806284783,"results":"24","hashOfConfig":"14"},{"size":5997,"mtime":1609806409462,"results":"25","hashOfConfig":"14"},{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"28"},"lcbj9u",{"filePath":"29","messages":"30","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"28"},{"filePath":"31","messages":"32","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"28"},{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"28"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"39","messages":"40","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"28"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"28"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"49","messages":"50","errorCount":0,"warningCount":5,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\index.tsx",[],["51","52"],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\reportWebVitals.ts",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\App.tsx",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Header.tsx",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Home.tsx",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Main.tsx",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Contact.tsx",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Resume.tsx",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\ProjectGrid.tsx",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\cusotmHooks.ts",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\Footer.tsx",[],"C:\\Users\\jdc10\\Documents\\GitHub\\PersonalWebsite_Static\\src\\components\\AboutMe.tsx",["53","54","55","56","57"],{"ruleId":"58","replacedBy":"59"},{"ruleId":"60","replacedBy":"61"},{"ruleId":"62","severity":1,"message":"63","line":8,"column":10,"nodeType":"64","messageId":"65","endLine":8,"endColumn":24},{"ruleId":"62","severity":1,"message":"66","line":8,"column":26,"nodeType":"64","messageId":"65","endLine":8,"endColumn":43},{"ruleId":"62","severity":1,"message":"67","line":9,"column":10,"nodeType":"64","messageId":"65","endLine":9,"endColumn":26},{"ruleId":"62","severity":1,"message":"68","line":9,"column":28,"nodeType":"64","messageId":"65","endLine":9,"endColumn":47},{"ruleId":"69","severity":1,"message":"70","line":115,"column":6,"nodeType":"71","endLine":115,"endColumn":8,"suggestions":"72"},"no-native-reassign",["73"],"no-negated-in-lhs",["74"],"@typescript-eslint/no-unused-vars","'nowPlayingSong' is assigned a value but never used.","Identifier","unusedVar","'setNowPlayingSong' is assigned a value but never used.","'nowPlayingArtist' is assigned a value but never used.","'setNowPlayingArtist' is assigned a value but never used.","react-hooks/exhaustive-deps","React Hook useEffect has a missing dependency: 'UpdateAge'. Either include it or remove the dependency array.","ArrayExpression",["75"],"no-global-assign","no-unsafe-negation",{"desc":"76","fix":"77"},"Update the dependencies array to be: [UpdateAge]",{"range":"78","text":"79"},[2826,2828],"[UpdateAge]"] \ No newline at end of file diff --git a/src/components/ProjectGrid.scss b/src/components/ProjectGrid.scss index f54645c..9a2de41 100644 --- a/src/components/ProjectGrid.scss +++ b/src/components/ProjectGrid.scss @@ -1,6 +1,6 @@ @import "~include-media/dist/_include-media.scss"; -$breakpoints: (x-small: 400px, small: 660px, medium: 900px, large: 1300px, x-large: 1560px); +$breakpoints: (x-small: 430px, small: 660px, medium: 900px, large: 1300px, x-large: 1560px); // Override Sass min() @function min($numbers...) { @@ -45,13 +45,13 @@ $breakpoints: (x-small: 400px, small: 660px, medium: 900px, large: 1300px, x-lar //padding: 10px; @include media("<=x-small") { - .GridSizer, .OneWide, .FourByOne { + .GridSizer, .OneWide, .FourByOne .Medium { width: 100%; } } @include media(">x-small", "=small", "=medium") { + // Two column sort of layout + .image { + float: left; + width: 50%; + shape-outside: inset(0); + + img { + margin-bottom: 0; + } + } + + .description { + display: inline; + + p { + text-align: justify; + } + + h2 h3 { + display: inline; + } + } + } + + @include media(">x-large") { + .image { + width: 40%; + } + } +} + .FourByOne { .GridElementInternal { display: flex; diff --git a/src/components/ProjectGrid.tsx b/src/components/ProjectGrid.tsx index 1f4e77a..99a6203 100644 --- a/src/components/ProjectGrid.tsx +++ b/src/components/ProjectGrid.tsx @@ -36,7 +36,7 @@ type GridElementProps = { org?: string; }; -function OneWide({ title, text, link, org }: GridElementProps) { +function SmallElement({ title, text, link, org }: GridElementProps) { if (link === undefined) { return (
@@ -53,12 +53,17 @@ function OneWide({ title, text, link, org }: GridElementProps) { ); } return ( - +

{title}

{org &&

{org}

} - +

{text}

@@ -66,9 +71,16 @@ function OneWide({ title, text, link, org }: GridElementProps) {
); -}; +} -function OneWidePic({ image_url, image_alt, title, text, link, org }: GridElementImageProps) { +function SmallElementPic({ + image_url, + image_alt, + title, + text, + link, + org, +}: GridElementImageProps) { if (link === undefined) { return (
@@ -108,7 +120,60 @@ function OneWidePic({ image_url, image_alt, title, text, link, org }: GridElemen ); } -function FourByOneGridElement({ image_url, image_alt, title, text, link, org }: GridElementImageProps) { +function MediumElement({ + image_url, + image_alt, + title, + text, + link, + org, +}: GridElementImageProps) { + if (link === undefined) { + return ( +
+
+
+ {image_alt} +
+
+

{title}

+ {org &&

{org}

} +

{text}

+
+
+
+ ); + } + return ( + +
+
+ {image_alt} + +
+
+

{title}

+ {org &&

{org}

} +

{text}

+
+
+
+ ); +} + +function LargeElementPic({ + image_url, + image_alt, + title, + text, + link, + org, +}: GridElementImageProps) { if (link === undefined) { return (
@@ -177,7 +242,7 @@ export function ProjectGrid() {
- - - - - - - - - - + +