From 7e6651cf94b8bbfe95d2e218b61f5f586562e831 Mon Sep 17 00:00:00 2001 From: Sarah Fowler Date: Wed, 25 Sep 2019 11:45:37 -0400 Subject: [PATCH 1/2] [LIGO-93] redesign profile pics --- .gitignore | 1 + gitlab-pages/.gitignore | 1 + gitlab-pages/website/pages/en/index.js | 240 ++++++++++++++------- gitlab-pages/website/siteConfig.js | 124 +++++------ gitlab-pages/website/static/css/custom.css | 32 +++ gitlab-pages/website/static/img/user.svg | 17 ++ 6 files changed, 279 insertions(+), 136 deletions(-) create mode 100644 gitlab-pages/website/static/img/user.svg diff --git a/.gitignore b/.gitignore index 10c5583fa..ced532fda 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ dune-project cache/* Version.ml /_opam/ +**/.DS_Store \ No newline at end of file diff --git a/gitlab-pages/.gitignore b/gitlab-pages/.gitignore index 7dbdd7e15..66c160e49 100644 --- a/gitlab-pages/.gitignore +++ b/gitlab-pages/.gitignore @@ -1,4 +1,5 @@ **/.DS_Store +.DS_Store node_modules diff --git a/gitlab-pages/website/pages/en/index.js b/gitlab-pages/website/pages/en/index.js index 0ad5ffa1a..c962109df 100644 --- a/gitlab-pages/website/pages/en/index.js +++ b/gitlab-pages/website/pages/en/index.js @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -const React = require('react'); +const React = require("react"); -const CompLibrary = require('../../core/CompLibrary.js'); +const CompLibrary = require("../../core/CompLibrary.js"); const MarkdownBlock = CompLibrary.MarkdownBlock; /* Used to read markdown */ const Container = CompLibrary.Container; @@ -15,46 +15,117 @@ const GridBlock = CompLibrary.GridBlock; class HomeSplash extends React.Component { render() { - const {siteConfig, language = ''} = this.props; - const {baseUrl, docsUrl} = siteConfig; - const docsPart = `${docsUrl ? `${docsUrl}/` : ''}`; - const langPart = `${language ? `${language}/` : ''}`; + const { siteConfig, language = "" } = this.props; + const { baseUrl, docsUrl } = siteConfig; + const docsPart = `${docsUrl ? `${docsUrl}/` : ""}`; + const langPart = `${language ? `${language}/` : ""}`; const docUrl = doc => `${baseUrl}${docsPart}${langPart}${doc}`; const SplashContainer = props => (
- -
-
-
PascaLIGO
-
CameLIGO
-
ReasonLIGO (coming soon)
- {/*
+
+
+ PascaLIGO +
+
+ CameLIGO +
+
ReasonLIGO (coming soon)
+ {/*
Camligo
*/} -
-
-
-
- - 
// variant defining pseudo multi-entrypoint actions
type action is
| Increment of int
| Decrement of int

function add (const a : int ; const b : int) : int is
    block {'{ skip }'} with a + b

function subtract (const a : int ; const b : int) : int is
    block {'{ skip }'} with a - b

// real entrypoint that re-routes the flow based on the action provided
function main (const p : action ; const s : int) : (list(operation) * int) is
  block {'{ skip }'} with ((nil : list(operation)),
    case p of
    | Increment(n) -> add(s, n)
    | Decrement(n) -> subtract(s, n)
    end)
- -
-
-
- 
-                    
-                    type storage = int 

(* variant defining pseudo multi-entrypoint actions *) 

type action =
| Increment of int
| Decrement of int

let add (a: int) (b: int) : int = a + b

let subtract (a: int) (b: int) : int = a - b

(* real entrypoint that re-routes the flow based on the action provided *)

let%entry main (p : action) storage =
  let storage =
    match p with
     | Increment n -> add storage n
     | Decrement n -> subtract storage n
  in (([] : operation list), storage)

-                    
-
+
+
+
+ + 
+                        
+                          // variant defining pseudo multi-entrypoint actions
+                          

+                          type action is
+                          
| Increment of int
+                          
| Decrement of int
+                          

+                          

+                          function add (const a : int ; const b : int) : int is
+                          
 block {"{ skip }"} with a + b

+                          

+                          function subtract (const a : int ; const b : int) :
+                          int is
+                          
 block {"{ skip }"} with a - b

+                          

+                          // real entrypoint that re-routes the flow based on
+                          the action provided
+                          

+                          function main (const p : action ; const s : int) :
+                          (list(operation) * int) is
+                          
 block {"{ skip }"} with ((nil :
+                          list(operation)),
+                          
 case p of
+                          
 | Increment(n) -> add(s, n)
+                          
 | Decrement(n) -> subtract(s, n)
+                          
 end)
+                          

+                        
+
+ +
+
+
+
+ 
+                      
+                        type storage = int 

+                        

+                        (* variant defining pseudo multi-entrypoint actions *){" "}
+                        

+                        

+                        type action =
| Increment of int
+                        
| Decrement of int
+                        

+                        

+                        let add (a: int) (b: int) : int = a + b

+                        

+                        let subtract (a: int) (b: int) : int = a - b

+                        

+                        (* real entrypoint that re-routes the flow based on the
+                        action provided *)
+                        

+                        

+                        let%entry main (p : action) storage =
 let storage
+                        =
 match p with
+                        
 | Increment n -> add storage n
 | Decrement
+                        n -> subtract storage n
 in (([] : operation list),
+                        storage)
+                        

+                      
+
+
-
{props.children}
@@ -95,9 +166,19 @@ class HomeSplash extends React.Component {
- - - + + +
@@ -107,14 +188,15 @@ class HomeSplash extends React.Component { class Index extends React.Component { render() { - const {config: siteConfig, language = ''} = this.props; - const {baseUrl} = siteConfig; + const { config: siteConfig, language = "" } = this.props; + const { baseUrl } = siteConfig; const Block = props => ( + background={props.background} + > (
+ style={{ textAlign: "center" }} + >

Feature Callout

These are features of this project
@@ -137,13 +220,13 @@ class Index extends React.Component { {[ { content: - 'To make your landing page more attractive, use illustrations! Check out ' + - '[**unDraw**](https://undraw.co/) which provides you with customizable illustrations which are free to use. ' + - 'The illustrations you see on this page are from unDraw.', + "To make your landing page more attractive, use illustrations! Check out " + + "[**unDraw**](https://undraw.co/) which provides you with customizable illustrations which are free to use. " + + "The illustrations you see on this page are from unDraw.", image: `${baseUrl}img/undraw_code_review.svg`, - imageAlign: 'left', - title: 'Wonderful SVG Illustrations', - }, + imageAlign: "left", + title: "Wonderful SVG Illustrations" + } ]} ); @@ -153,11 +236,11 @@ class Index extends React.Component { {[ { content: - 'This is another description of how this project is useful', + "This is another description of how this project is useful", image: `${baseUrl}img/undraw_note_list.svg`, - imageAlign: 'right', - title: 'Description', - }, + imageAlign: "right", + title: "Description" + } ]} ); @@ -167,11 +250,11 @@ class Index extends React.Component { {[ { content: - 'Each new Docusaurus project has **randomly-generated** theme colors.', + "Each new Docusaurus project has **randomly-generated** theme colors.", image: `${baseUrl}img/undraw_youtube_tutorial.svg`, - imageAlign: 'right', - title: 'Randomly Generated Theme Colors', - }, + imageAlign: "right", + title: "Randomly Generated Theme Colors" + } ]} ); @@ -182,22 +265,24 @@ class Index extends React.Component { {[ { - content: 'Write in PascaLIGO (pascal-like syntax) or CameLIGO (caml-like syntax). If you know OCaml, you can also add your own syntax.', + content: + "Write in PascaLIGO (pascal-like syntax) or CameLIGO (caml-like syntax). If you know OCaml, you can also add your own syntax.", image: `${baseUrl}img/edit.svg`, - imageAlign: 'top', - title: 'Syntax Agnostic', + imageAlign: "top", + title: "Syntax Agnostic" }, { - content: 'Write types, then code, and benefit from the safety coming from type systems.', + content: + "Write types, then code, and benefit from the safety coming from type systems.", image: `${baseUrl}img/lightning.svg`, - imageAlign: 'top', - title: 'Strong Type System', + imageAlign: "top", + title: "Strong Type System" }, { - content: 'With Granary, you can use LIGO as a lib from NodeJS.', + content: "With Granary, you can use LIGO as a lib from NodeJS.", image: `${baseUrl}img/puzzle.svg`, - imageAlign: 'top', - title: 'Easy Integration', + imageAlign: "top", + title: "Easy Integration" } ]} @@ -206,19 +291,19 @@ class Index extends React.Component { const Roadmap = () => (
- + {[ { - content: + content: "

June 2019

" + - "
    " + + "
      " + "
    • First public release
      • " + "
    • PascaLIGO and CameLIGO syntaxes
      • " + "
    • Docs and Tutorials
      • " + "
    • Integration testing in ReasonML/JS with Granary
      • " + "
    " + "

    July 2019

    " + - "
      " + + "
        " + "
      • Try LIGO online editor
        • " + "
      • Unit testing toolkit
        • " + "
      • ReasonLIGO syntax support
        • " + @@ -229,9 +314,9 @@ class Index extends React.Component { "Long term plans will be announced soon" + "        ", image: ``, - imageAlign: 'right', - title: 'Roadmap', - }, + imageAlign: "right", + title: "Roadmap" + } ]}
@@ -250,7 +335,7 @@ class Index extends React.Component { )); - const pageUrl = page => baseUrl + (language ? `${language}/` : '') + page; + const pageUrl = page => baseUrl + (language ? `${language}/` : "") + page; return (
@@ -273,18 +358,22 @@ class Index extends React.Component { const showcase = siteConfig.team .filter(user => user.pinned) .map(user => ( - - {user.caption} -

{user.caption}

+ + {user.caption} +

{user.caption}

 )); - const pageUrl = page => baseUrl + (language ? `${language}/` : '') + page; + const pageUrl = page => baseUrl + (language ? `${language}/` : "") + page; return (

Team

-
{showcase}
+
{showcase}
{/*
More {siteConfig.title} Users @@ -298,7 +387,6 @@ class Index extends React.Component {
- {/* */} {/* */} diff --git a/gitlab-pages/website/siteConfig.js b/gitlab-pages/website/siteConfig.js index 574cf8623..0d2780144 100644 --- a/gitlab-pages/website/siteConfig.js +++ b/gitlab-pages/website/siteConfig.js @@ -11,99 +11,103 @@ // List of projects/orgs using your project for the users page. const partners = [ { - caption: 'Nomadic Labs', + caption: "Nomadic Labs", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/nomadic-logo.jpg', - infoLink: 'https://www.nomadic-labs.com/', - pinned: true, + image: "/img/nomadic-logo.jpg", + infoLink: "https://www.nomadic-labs.com/", + pinned: true }, { - caption: 'Tocqueville Group', + caption: "Tocqueville Group", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/tq-logo.svg', - infoLink: 'https://tqgroup.io/', - pinned: true, + image: "/img/tq-logo.svg", + infoLink: "https://tqgroup.io/", + pinned: true }, { - caption: 'Stove Labs', + caption: "Stove Labs", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/stove-logo.png', - infoLink: 'https://stove-labs.com', - pinned: true, - }, + image: "/img/stove-logo.png", + infoLink: "https://stove-labs.com", + pinned: true + } ]; const team = [ { - caption: 'Gabriel Alfour', + caption: "Gabriel Alfour", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/user.png', - infoLink: 'https://gitlab.com/gabriel.alfour', - pinned: true, + image: "/img/user.svg", + infoLink: "https://gitlab.com/gabriel.alfour", + pinned: true }, { - caption: 'Georges Dupéron', + caption: "Georges Dupéron", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/user.png', - infoLink: 'https://gitlab.com/georges.duperon', - pinned: true, + image: "/img/user.svg", + infoLink: "https://gitlab.com/georges.duperon", + pinned: true }, { - caption: 'Christian Rinderknecht', + caption: "Christian Rinderknecht", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/christian.jpeg', - infoLink: 'https://github.com/rinderknecht', - pinned: true, + image: "/img/christian.jpeg", + infoLink: "https://github.com/rinderknecht", + pinned: true }, { - caption: 'Brice Aldrich', + caption: "Brice Aldrich", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/brice.png', - infoLink: 'https://github.com/DefinitelyNotAGoat', - pinned: true, + image: "/img/brice.png", + infoLink: "https://github.com/DefinitelyNotAGoat", + pinned: true }, { - caption: 'Matej Sima', + caption: "Matej Sima", // You will need to prepend the image path with your baseUrl // if it is not '/', like: '/test-site/img/image.jpg'. - image: '/img/matej.jpg', - infoLink: 'https://github.com/maht0rz', - pinned: true, - }, + image: "/img/matej.jpg", + infoLink: "https://github.com/maht0rz", + pinned: true + } ]; const siteConfig = { - title: 'LIGO', // Title for your website. - tagline: 'LIGO is a statically typed high-level smart-contract language that compiles down to Michelson. It seeks to be easy to use, extensible and safe.', - url: 'https://your-docusaurus-test-site.com', // Your website URL - baseUrl: '/', // Base URL for your project */ + title: "LIGO", // Title for your website. + tagline: + "LIGO is a statically typed high-level smart-contract language that compiles down to Michelson. It seeks to be easy to use, extensible and safe.", + url: "https://your-docusaurus-test-site.com", // Your website URL + baseUrl: "/", // Base URL for your project */ // For github.io type URLs, you would set the url and baseUrl like: // url: 'https://facebook.github.io', // baseUrl: '/test-site/', // Used for publishing and more - projectName: 'ligo', - organizationName: 'marigold', + projectName: "ligo", + organizationName: "marigold", // For top-level user or org sites, the organization is still the same. // e.g., for the https://JoelMarcey.github.io site, it would be set like... // organizationName: 'JoelMarcey' // For no header links in the top nav bar -> headerLinks: [], headerLinks: [ - {doc: 'setup/installation', label: 'Docs'}, - {doc: 'tutorials/get-started/tezos-taco-shop-smart-contract', label: 'Tutorials'}, - { blog: true, label: 'Blog' }, + { doc: "setup/installation", label: "Docs" }, + { + doc: "tutorials/get-started/tezos-taco-shop-smart-contract", + label: "Tutorials" + }, + { blog: true, label: "Blog" }, // TODO: { href: "/odoc", label: "Api" }, - {doc: 'contributors/origin', label: 'Contribute'}, - {href: 'https://discord.gg/9rhYaEt', label: ''}, - { search: true }, + { doc: "contributors/origin", label: "Contribute" }, + { href: "https://discord.gg/9rhYaEt", label: "" }, + { search: true } ], // If you have users set above, you add it here: @@ -111,14 +115,14 @@ const siteConfig = { team, /* path to images for header/footer */ - headerIcon: 'img/logo.svg', - footerIcon: 'img/logo.svg', - favicon: 'img/logo.svg', + headerIcon: "img/logo.svg", + footerIcon: "img/logo.svg", + favicon: "img/logo.svg", /* Colors for website */ colors: { - primaryColor: '#1A1A1A', - secondaryColor: '#1A1A1A', + primaryColor: "#1A1A1A", + secondaryColor: "#1A1A1A" }, /* Custom fonts for website */ @@ -140,20 +144,20 @@ const siteConfig = { highlight: { // Highlight.js theme to use for syntax highlighting in code blocks. - theme: 'default', + theme: "default" }, // Add custom scripts here that would be placed in