Skip to content
This repository was archived by the owner on Feb 15, 2022. It is now read-only.

rename industry to principles #376

Merged
merged 3 commits into from
May 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pages/index.res
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module HeroSection = {
/>
<Button
colors=`text-orangedark bg-white hover:bg-gray-50`
href=InternalUrls.industryWhatisocaml
href=InternalUrls.principlesWhatisocaml
text=content.aboutOcaml
margins=`mt-3 sm:mt-0 sm:ml-3`
/>
Expand Down
2 changes: 1 addition & 1 deletion pages/industry/users.res → pages/principles/users.res
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ let make = (~content=contentEn) => <>
pageDescription=content.pageDescription
callToAction={
TitleHeading.Large.label: "Success Stories",
url: InternalUrls.industrySuccessstories,
url: InternalUrls.principlesSuccesses,
}>
<LogoSection margins=`` companies=content.companies />
</Page.Basic>
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Footer.res
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ module MainLinksSection = {
}

type t = {
industrySection: Section.t,
principlesSection: Section.t,
resourcesSection: Section.t,
communitySection: Section.t,
legalSection: Section.t,
Expand All @@ -116,7 +116,7 @@ module MainLinksSection = {
<div className={"grid grid-cols-2 gap-8 " ++ margins ++ ` ` ++ colspan}>
<div className="md:grid md:grid-cols-2 md:gap-8">
{
let section = content.industrySection
let section = content.principlesSection
<SectionLinks name=section.header keyPages=section.entries margins=`` />
}
{
Expand Down
2 changes: 1 addition & 1 deletion src/Footer.resi
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module MainLinksSection: {
}

type t = {
industrySection: Section.t,
principlesSection: Section.t,
resourcesSection: Section.t,
communitySection: Section.t,
legalSection: Section.t,
Expand Down
54 changes: 27 additions & 27 deletions src/GlobalData.res
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type industrySection = {
type principlesSection = {
header: string,
whatIsOcaml: NavEntry.t,
industrialUsers: NavEntry.t,
Expand All @@ -23,37 +23,37 @@ type communitySection = {
}

type navContent = {
industrySection: industrySection,
principlesSection: principlesSection,
resourcesSection: resourcesSection,
communitySection: communitySection,
}

let navContentEn = {
industrySection: {
header: `Industry`,
principlesSection: {
header: `Principles`,
whatIsOcaml: {
label: `Why OCaml`,
url: InternalUrls.industryWhatisocaml,
url: InternalUrls.principlesWhatisocaml,
icon: Icons.camel,
text: "Find out about OCaml and how it became what it is today.",
text: "Find out about OCaml's history and how it became what it is today.",
},
industrialUsers: {
label: `Industrial Users`,
url: InternalUrls.industryUsers,
url: InternalUrls.principlesIndustrialUsers,
icon: Icons.industry,
text: "Discover the organisations and companies that use OCaml to accomplish their goals.",
text: "Discover the organisations that use OCaml to accomplish their goals.",
},
academicExcellence: {
label: `Academic Excellence`,
url: InternalUrls.industrySuccessstories /* TODO - point to correct page once it's created */,
url: InternalUrls.principlesSuccesses /* TODO - point to correct page once it's created */,
icon: Icons.academic,
text: "Learn about the universities and academics that use OCaml.",
text: "Learn about the academics that research programming language technology.",
},
successStories: {
label: `Success Stories`,
url: InternalUrls.industrySuccessstories,
url: InternalUrls.principlesSuccesses,
icon: Icons.success,
text: "Read about the great things that have been achieved using OCaml.",
text: "Read about the things that have been achieved using OCaml.",
},
},
resourcesSection: {
Expand All @@ -62,25 +62,25 @@ let navContentEn = {
label: `Language`,
url: InternalUrls.resourcesLanguage,
icon: Icons.language,
text: "Discover the OCaml tutorial, books and papers on OCaml, as well as the OCaml Manual.",
text: "Read through the OCaml tutorial, official manual and books.",
},
packages: {
label: `Packages`,
url: "http://ci5.ocamllabs.io:8082/" /* TODO - point to correct page once it's created */,
icon: Icons.packages,
text: "Browse the many packages available in OCaml.",
text: "Browse the third-party packages published in the OCaml ecosystem.",
},
applications: {
label: `Applications`,
url: InternalUrls.resourcesApplications,
icon: Icons.applications,
text: "Using or building tools and applicatins in OCaml? This page is full of useful information.",
text: "Learn techniques for building tools and applications in OCaml.",
},
bestPractices: {
label: `Best Practices`,
url: InternalUrls.resourcesBestpractices,
icon: Icons.bestPractices,
text: "Some of the best known methods in OCaml are shared here, as well as the Platform Tools.",
text: "Adopt the best known methods for development from the OCaml community.",
},
},
communitySection: {
Expand Down Expand Up @@ -113,13 +113,13 @@ let navContentEn = {
}

let headerContentEn: HeaderNavigation.content = {
industrySection: {
header: navContentEn.industrySection.header,
principlesSection: {
header: navContentEn.principlesSection.header,
entries: [
navContentEn.industrySection.whatIsOcaml,
navContentEn.industrySection.industrialUsers,
navContentEn.industrySection.academicExcellence,
navContentEn.industrySection.successStories,
navContentEn.principlesSection.whatIsOcaml,
navContentEn.principlesSection.industrialUsers,
navContentEn.principlesSection.academicExcellence,
navContentEn.principlesSection.successStories,
],
},
resourcesSection: {
Expand Down Expand Up @@ -150,12 +150,12 @@ let footerContentEn: Footer.t = {
ocamlSummary: `Innovation. Community. Security.`,
},
mainLinksContent: {
industrySection: {
header: navContentEn.industrySection.header,
principlesSection: {
header: navContentEn.principlesSection.header,
entries: [
navContentEn.industrySection.whatIsOcaml,
navContentEn.industrySection.industrialUsers,
navContentEn.industrySection.successStories,
navContentEn.principlesSection.whatIsOcaml,
navContentEn.principlesSection.industrialUsers,
navContentEn.principlesSection.successStories,
],
},
resourcesSection: {
Expand Down
4 changes: 2 additions & 2 deletions src/GlobalData.resi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type industrySection = {
type principlesSection = {
header: string,
whatIsOcaml: NavEntry.t,
industrialUsers: NavEntry.t,
Expand All @@ -23,7 +23,7 @@ type communitySection = {
}

type navContent = {
industrySection: industrySection,
principlesSection: principlesSection,
resourcesSection: resourcesSection,
communitySection: communitySection,
}
Expand Down
14 changes: 7 additions & 7 deletions src/HeaderNavigation.res
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ type section = {
}

type content = {
industrySection: section,
principlesSection: section,
resourcesSection: section,
communitySection: section,
search: string,
openMenu: string,
}

type activatedEntry =
| Industry
| Principles
| Resources
| Community

Expand Down Expand Up @@ -54,11 +54,11 @@ let make = (~content) => {
<nav className="hidden md:flex space-x-10 ">
<div className="relative">
<button
onClick={toggleMenu(Industry)}
onClick={toggleMenu(Principles)}
type_="button"
className="text-gray-500 pl-2 group bg-white rounded-md inline-flex items-center text-base font-medium hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-orangedark"
ariaExpanded=false>
<span> {s(content.industrySection.header)} </span>
<span> {s(content.principlesSection.header)} </span>
<svg
className="text-gray-400 ml-2 h-5 w-5 group-hover:text-gray-500"
xmlns="http://www.w3.org/2000/svg"
Expand All @@ -75,13 +75,13 @@ let make = (~content) => {
<div
className={"absolute z-10 left-1/2 transform -translate-x-1/4 mt-3 px-2 w-screen max-w-sm sm:px-0 " ++
switch activeMenu {
| Some(Industry) => " opacity-100 translate-y-0 "
| Some(Principles) => " opacity-100 translate-y-0 "
| _ => " hidden "
}}>
<div
className="rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 overflow-hidden">
<div className="relative grid gap-6 bg-white px-5 py-6 sm:gap-6 sm:p-8">
{content.industrySection.entries
{content.principlesSection.entries
|> Js.Array.mapi((e: NavEntry.t, idx) =>
<Link href=e.url key={Js.Int.toString(idx)}>
<a
Expand Down Expand Up @@ -329,7 +329,7 @@ let make = (~content) => {
</h3>,
],
),
[content.industrySection, content.resourcesSection, content.communitySection],
[content.principlesSection, content.resourcesSection, content.communitySection],
),
[],
) |> React.array}
Expand Down
2 changes: 1 addition & 1 deletion src/HeaderNavigation.resi
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type section = {
}

type content = {
industrySection: section,
principlesSection: section,
resourcesSection: section,
communitySection: section,
search: string,
Expand Down
6 changes: 3 additions & 3 deletions src/InternalUrls.res
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ let communityMediaarchive = "/community/mediaarchive"
let communityNews = "/community/news"
let communityNewsarchive = "/community/newsarchive"
let communityOpportunities = "/community/opportunities"
let industrySuccessstories = "/industry/successstories"
let industryUsers = "/industry/users"
let industryWhatisocaml = "/industry/whatisocaml"
let principlesSuccesses = "/principles/successes"
let principlesIndustrialUsers = "/principles/users"
let principlesWhatisocaml = "/principles/whatisocaml"
let legalCarbonfootprint = "/legal/carbonfootprint"
let legalPrivacy = "/legal/privacy"
let legalTerms = "/legal/terms"
Expand Down