Merge pull request #31 from ameyrupji-com/develop

v1.0

.circleci/config.yml

@@ -45,10 +45,45 @@ jobs:
       - run: 
           name: build
           command: | 
-            cd src
+            cd src/
+            rm view/data/app.json
+            mv view/data/prod/app.json view/data/app.json
+            rm -rf dist/
             npm install parcel-bundler --save-dev
             npm run build
       - *save_repo
+  build-develop:
+    <<: *build_default_config
+    steps:
+      - checkout
+      - run: 
+          name: build
+          command: | 
+            cd src/
+            rm view/data/app.json
+            mv view/data/beta/app.json view/data/app.json
+            rm -rf dist/
+            npm install parcel-bundler --save-dev
+            npm run build
+            cd dist/
+            find ./ -type f -name '*.css' -exec sed -i 's|url(../|url(|g' {} \;
+      - *save_repo
+  build-branch:
+    <<: *build_default_config
+    steps:
+      - checkout
+      - run: 
+          name: build
+          command: | 
+            cd src/
+            rm view/data/app.json
+            mv view/data/beta/app.json view/data/app.json
+            rm -rf dist/
+            npm install parcel-bundler --save-dev
+            npm run build
+            cd dist/
+            find ./ -type f -name '*.css' -exec sed -i 's|url(../|url(|g' {} \;
+      - *save_repo
   upload-master:
     <<: *deploy_default_config
     steps:
@@ -78,7 +113,22 @@ workflows:
   version: 2
   build-upload:
     jobs:
-      - build
+      - build:
+          filters:
+            branches:
+              only: 
+                - master
+      - build-develop:
+          filters:
+            branches:
+              only: 
+                - develop
+      - build-branch:
+          filters:
+            branches:
+              ignore: 
+                - master
+                - develop
       - approve-master:
           type: approval
           requires:
@@ -94,13 +144,13 @@ workflows:
                 only: master
       - upload-develop:
           requires:
-              - build
+              - build-develop 
           filters:
               branches:
                 only: develop
       - upload-branches:
           requires:
-              - build
+              - build-branch
           filters:
               branches:
                 ignore: 

.gitignore

@@ -80,4 +80,7 @@ typings/
 .dynamodb/
 
 # from parcel/.gitignore
-dist
+dist
+
+# macOS file
+.DS_Store

Cookie-Policy.md

@@ -0,0 +1,49 @@
+# ameyrupji.com Cookie Policy
+
+Last updated: May 10, 2019
+
+Amey Rupji ("us", "we", or "our") uses cookies on the http://ameyrupji.com website (the "Service"). By using the Service, you consent to the use of cookies.
+
+Our Cookies Policy explains what cookies are, how we use cookies, how third-parties we may partner with may use cookies on the Service, your choices regarding cookies and further information about cookies. This Cookies Policy for Amey Rupji has been created with the help of TermsFeed.
+
+What are cookies
+
+Cookies are small pieces of text sent by your web browser by a website you visit. A cookie file is stored in your web browser and allows the Service or a third-party to recognize you and make your next visit easier and the Service more useful to you.
+
+Cookies can be "persistent" or "session" cookies. Persistent cookies remain on your personal computer or mobile device when you go offline, while session cookies are deleted as soon as you close your web browser.
+
+How Amey Rupji uses cookies
+
+When you use and access the Service, we may place a number of cookies files in your web browser.
+
+We use cookies for the following purposes:
+
+To enable certain functions of the Service
+
+We use both session and persistent cookies on the Service and we use different types of cookies to run the Service:
+
+Essential cookies. We may use essential cookies to authenticate users and prevent fraudulent use of user accounts.
+
+What are your choices regarding cookies
+
+If you'd like to delete cookies or instruct your web browser to delete or refuse cookies, please visit the help pages of your web browser. As an European citizen, under GDPR, you have certain individual rights. You can learn more about these rights in the GDPR Guide.
+
+Please note, however, that if you delete cookies or refuse to accept them, you might not be able to use all of the features we offer, you may not be able to store your preferences, and some of our pages might not display properly.
+
+For the Chrome web browser, please visit this page from Google: https://support.google.com/accounts/answer/32050
+
+For the Internet Explorer web browser, please visit this page from Microsoft: http://support.microsoft.com/kb/278835
+
+For the Firefox web browser, please visit this page from Mozilla: https://support.mozilla.org/en-US/kb/delete-cookies-remove-info-websites-stored
+
+For the Safari web browser, please visit this page from Apple: https://support.apple.com/kb/PH21411?locale=en_US
+
+For any other web browser, please visit your web browser's official web pages.
+
+Where can you find more information about cookies
+
+You can learn more about cookies and the following third-party websites:
+
+AllAboutCookies: http://www.allaboutcookies.org/
+
+Network Advertising Initiative: http://www.networkadvertising.org/

Privacy-Policy.md

@@ -0,0 +1,125 @@
+# ameyrupji.com - Privacy Policy
+
+Effective date: May 10, 2019
+
+Amey Rupji ("us", "we", or "our") operates the http://ameyrupji.com website (hereinafter referred to as the "Service").
+
+This page informs you of our policies regarding the collection, use, and disclosure of personal data when you use our Service and the choices you have associated with that data. The Privacy Policy for Amey Rupji has been created with the help of TermsFeed.
+
+We use your data to provide and improve the Service. By using the Service, you agree to the collection and use of information in accordance with this policy. Unless otherwise defined in this Privacy Policy, the terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, accessible from http://ameyrupji.com
+
+## Definitions
+
+### Service
+
+Service is the http://ameyrupji.com website operated by Amey Rupji
+
+### Personal Data
+
+Personal Data means data about a living individual who can be identified from those data (or from those and other information either in our possession or likely to come into our possession).
+
+### Usage Data
+
+Usage Data is data collected automatically either generated by the use of the Service or from the Service infrastructure itself (for example, the duration of a page visit).
+
+### Cookies
+
+Cookies are small files stored on your device (computer or mobile device).
+
+### Information Collection and Use
+
+We collect several different types of information for various purposes to provide and improve our Service to you.
+
+### Types of Data Collected
+
+#### Personal Data
+
+While using our Service, we may ask you to provide us with certain personally identifiable information that can be used to contact or identify you ("Personal Data"). Personally identifiable information may include, but is not limited to:
+
+#### Cookies and Usage Data
+##### Usage Data
+
+We may also collect information how the Service is accessed and used ("Usage Data"). This Usage Data may include information such as your computer's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that you visit, the time and date of your visit, the time spent on those pages, unique device identifiers and other diagnostic data.
+
+#### Tracking & Cookies Data
+
+We use cookies and similar tracking technologies to track the activity on our Service and we hold certain information.
+
+Cookies are files with a small amount of data which may include an anonymous unique identifier. Cookies are sent to your browser from a website and stored on your device. Other tracking technologies are also used such as beacons, tags and scripts to collect and track information and to improve and analyse our Service.
+
+You can instruct your browser to refuse all cookies or to indicate when a cookie is being sent. However, if you do not accept cookies, you may not be able to use some portions of our Service.
+
+##### Examples of Cookies we use:
+
+Session Cookies. We use Session Cookies to operate our Service.
+Preference Cookies. We use Preference Cookies to remember your preferences and various settings.
+Security Cookies. We use Security Cookies for security purposes.
+Use of Data
+
+Amey Rupji uses the collected data for various purposes:
+
+To provide and maintain the Service
+To notify you about changes to our Service
+To allow you to participate in interactive features of our Service when you choose to do so
+To provide customer care and support
+To provide analysis or valuable information so that we can improve the Service
+To monitor the usage of the Service
+To detect, prevent and address technical issues
+Transfer Of Data
+
+Your information, including Personal Data, may be transferred to - and maintained on - computers located outside of your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from your jurisdiction.
+
+If you are located outside United States and choose to provide information to us, please note that we transfer the data, including Personal Data, to United States and process it there.
+
+Your consent to this Privacy Policy followed by your submission of such information represents your agreement to that transfer.
+
+Amey Rupji will take all steps reasonably necessary to ensure that your data is treated securely and in accordance with this Privacy Policy and no transfer of your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of your data and other personal information.
+
+## Disclosure Of Data
+
+### Legal Requirements
+
+Amey Rupji may disclose your Personal Data in the good faith belief that such action is necessary to:
+
+To comply with a legal obligation
+To protect and defend the rights or property of Amey Rupji
+To prevent or investigate possible wrongdoing in connection with the Service
+To protect the personal safety of users of the Service or the public
+To protect against legal liability
+As an European citizen, under GDPR, you have certain individual rights. You can learn more about these guides in the GDPR Guide.
+
+## Security of Data
+
+The security of your data is important to us but remember that no method of transmission over the Internet or method of electronic storage is 100% secure. While we strive to use commercially acceptable means to protect your Personal Data, we cannot guarantee its absolute security.
+
+## Service Providers
+
+We may employ third party companies and individuals to facilitate our Service ("Service Providers"), to provide the Service on our behalf, to perform Service-related services or to assist us in analyzing how our Service is used.
+
+These third parties have access to your Personal Data only to perform these tasks on our behalf and are obligated not to disclose or use it for any other purpose.
+
+## Links to Other Sites
+
+Our Service may contain links to other sites that are not operated by us. If you click a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
+
+We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
+
+## Children's Privacy
+
+Our Service does not address anyone under the age of 18 ("Children").
+
+We do not knowingly collect personally identifiable information from anyone under the age of 18. If you are a parent or guardian and you are aware that your Child has provided us with Personal Data, please contact us. If we become aware that we have collected Personal Data from children without verification of parental consent, we take steps to remove that information from our servers.
+
+## Changes to This Privacy Policy
+
+We may update our Privacy Policy from time to time. We will notify you of any changes by posting the new Privacy Policy on this page.
+
+We will let you know via email and/or a prominent notice on our Service, prior to the change becoming effective and update the "effective date" at the top of this Privacy Policy.
+
+You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page.
+
+## Contact Us
+
+If you have any questions about this Privacy Policy, please contact us:
+
+By email: ameyrupji@gmail.com

README.md

@@ -1,55 +1,70 @@
 # [ameyrupji.com](http://www.ameyrupji.com/)
 
-[![CircleCI](https://circleci.com/gh/ameyrupji/ameyrupji.com.svg?style=svg)](https://circleci.com/gh/ameyrupji/ameyrupji.com)
+[![CircleCI](https://circleci.com/gh/ameyrupji-com/ameyrupji.com.svg?style=svg)](https://circleci.com/gh/ameyrupji-com/ameyrupji.com)
 
 
-Git hub repository for my personal website deployed on the cloud (aws)
+This GitHub repository contains code to create static personal website deployed across multiple cloud providers (AWS, Google)
 
+The aim of this website is to showcase my skills in all areas of the software development lifecycle which include and are not limited to conceptualizing, website designing, planning for a minimal viable product, testing, release planning, releasing, and documenting and user-facing technical and non-technical documentation. I am using CircleCI to build and deploy my website using enterprise style deployment pattern by deploying feature branches.
+
+Please feel free to use any part of this repository. If you find this useful please Star or Folk this repository. If there is any suggestion for improvement within this code feel free to shoot me an email or create an issue.  
+
+## Prerequisites
+
+### Installed Software 
 
-## Prerequisites Software
 - HomeBrew
 - Parcel web package manager (Link: https://parceljs.org/getting_started.html)
-- 
+- Web browser
+
+### Editors 
+
+- Visual Sudio Code or Atom or any other text exitor of your choice 
+
 
 ## Branching / Deployment model
 
-### Master and Develop are lifelong branches.
+### Master and Develop are lifelong branches
 
-- master -> uploded to ameyrupji.com bucket accessable at http://www.ameyrupji.com
-- develop -> uploaded to beta.advisory.com bucket accessable at http://beta.ameyrupj.com
+- **master** - uploded to ameyrupji.com bucket accessable at http://www.ameyrupji.com
+- **develop** - uploaded to beta.advisory.com bucket accessable at http://beta.ameyrupj.com
 
 ### Feature branches
+
 May branch off from: develop
 Must merge back into: develop
 Branch naming convention: anything except master, develop or hotfix/*
 
 Feature branches (or sometimes called topic branches) are used to develop new features for the upcoming or a distant future release. 
 
-- feature/{feature-name} -> uploaded to beta.advisory.com bucket accessable at http://beta.ameyrupj.com/feature/feature-name/ 
+- **feature/{feature-name}** - uploaded to beta.advisory.com bucket accessable at http://beta.ameyrupj.com/feature/feature-name/ 
 
 
 ### Hotfix branches
+
 May branch off from: master
 Must merge back into: develop and master
 Branch naming convention: hotfix/*
 
 Hotfix branches are very much like master branches in that they are also meant to prepare for a new production release, albeit unplanned. They arise from the necessity to act immediately upon an undesired state of a live production version.
 
-- hotfix/{hotfix-name} -> uploaded to beta.advisory.com bucket accessable at http://beta.ameyrupj.com/hotfix/hotfix-name/ 
+- **hotfix/{hotfix-name}** - uploaded to beta.advisory.com bucket accessable at http://beta.ameyrupj.com/hotfix/hotfix-name/ 
 
 ### Release branches
 I am not following release branches for this repository to reduce complexisty of this simple webs0ite project
 
 For more information about github branching model folloed refer this link: https://nvie.com/posts/a-successful-git-branching-model/
 
 ## Useful links to dependant repositories
-- Infrastructure as Code: https://github.com/ameyrupji/ameyrupji.com-iac
 
+- Infrastructure as Code: https://github.com/ameyrupji-com/ameyrupji.com-iac
+- 
 
 ## TODOs:
 - [x] Setup CI Build and Deploy using CircleCI
 - [x] Build a basic cover page (coming soon)
 - [x] Setup CI build to deploy develop branche to beta.ameyrupji.com
 - [x] Setup CI build to deploy feature branches to beta.ameyrupji.com
+- [ ] Release planning and releasing v1.0
 
 

USEFUL-LINKS.md

@@ -0,0 +1,5 @@
+# Useful Links
+
+###### Scale contents of an iframe
+https://stackoverflow.com/questions/166160/how-can-i-scale-the-content-of-an-iframe/2224816#2224816
+(Smple: http://jsfiddle.net/dirkk0/EEgTx/show)

scripts/create-site-icons.txt

@@ -0,0 +1,20 @@
+Commands to be run to create the favicons for this website
+
+
+
+Beta: 
+./icons.sh -i ../src/images/icon-gradient-altertnate-beta.png -o ../src/images/beta-icons
+
+Prod:
+./icons.sh -i ../src/images/icon-gradient-altertnate.png -o ../src/images/icons
+
+
+Copy and rename Prod"
+cp ../src/images/icons/favicon-64x64.png ../src/favicon.ico
+
+
+
+
+Refence Links:
+https://realfavicongenerator.net/api/#.XM4ABC-ZPUJ
+https://www.npmjs.com/package/icon-gen