diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 000000000..5008ddfcf Binary files /dev/null and b/.DS_Store differ diff --git a/Journal.Rmd b/Journal.Rmd index 17562a3fc..4f71d974d 100644 --- a/Journal.Rmd +++ b/Journal.Rmd @@ -1,5 +1,5 @@ --- -title: "Journal" +title: "Advice + Tips" output: html_document: toc: true @@ -14,12 +14,9 @@ output: knitr::opts_chunk$set(message=FALSE,warning=FALSE, cache=TRUE) ``` -IMPORTANT: You can delete everything in here and start fresh. You might want to start by not deleting anything above this line until you know what that stuff is doing. +Here are our tips from experience with comps. - -This is an .Rmd file. It is plain text with special features. Any time you write just like this, it will be compiled to normal text in the website. If you put a \# in front of your text, it will create a top level-header. - -# My first post +# Start early 2018 | 7 | 23 Last compiled: `r Sys.Date()` @@ -33,13 +30,13 @@ You can add more headers by adding more hashtags. These won't be put into the ta Here's an even lower level header -# My second post (note the order) +# Read widely 2018 | 7 | 23 Last compiled: `r Sys.Date()` I'm writing this tutorial going from the top down. And, this is how it will be printed. So, notice the second post is second in the list. If you want your most recent post to be at the top, then make a new post starting at the top. If you want the oldest first, do, then keep adding to the bottom -# Adding R stuff +# Record citations (use Mendeley) So far this is just a blog where you can write in plain text and serve your writing to a webpage. One of the main purposes of this lab journal is to record your progress learning R. The reason I am asking you to use this process is because you can both make a website, and a lab journal, and learn R all in R-studio. This makes everything really convenient and in the sam place. diff --git a/Links.Rmd b/Links.Rmd index fae30c498..e9271918b 100644 --- a/Links.Rmd +++ b/Links.Rmd @@ -1,19 +1,13 @@ --- -title: "Resources" +title: "Links" output: html_document --- -### R and R-Studio +### Mendeley -[R](http://www.r-project.org) is a free open-source programming language that can be used for statistical analysis, data-simulation, graphing, and lots of other stuff. Another free program is [R-studio](http://www.rstudio.com), that provides a nice graphic interface for R. Download R first, then download R-studio. Both can run on PCs, Macs or Linux. Students will be learning R in the stats labs using the lab manual [](). +[Mendeley](https://www.mendeley.com) is a free citation and PDF organizer. Create an account and download Mendeley for desktop. See [here](https://www.mendeley.com/guides/using-citation-editor) for how to get started [](). -### Additional R resources +### Concept maps -1. Google is great, Google your problem -2. [Stackoverflow](https://stackoverflow.com) is great, google will often take you there because someone has already asked your question, and someone else has answered, usually many people have answered your question many ways. -3. Danielle Navarro wrote a [free Psych Stats textbook using R](https://compcogscisydney.org/learning-statistics-with-r/), it's worth checking out (some of our textbook are based on Danielle's) -4. I am currently writing another stats textbook (incorporating some of the above). You can read it while it's being made right here [https://crumplab.github.io/statistics/](https://crumplab.github.io/statistics/), also check out the lab manual for more specific things about doing various stats in R (also in draft right now) [https://crumplab.github.io/statisticsLab/](https://crumplab.github.io/statisticsLab/) -5. Daniell Navarro recently made this website for introducing R, it's great, check it out (also made using this R markdown process): [http://compcogscisydney.org/psyr/](http://compcogscisydney.org/psyr/) -6. Check out my slightly older programming book that also introduces R [https://crumplab.github.io/programmingforpsych/](https://crumplab.github.io/programmingforpsych/) -7. This is the definitive guide for all things R Markdown (you will find this very useful as you get better at this skill): [https://bookdown.org/yihui/rmarkdown/](https://bookdown.org/yihui/rmarkdown/) +1. Use concept maps. diff --git a/_site.yml b/_site.yml index ff5685971..88c59abdb 100644 --- a/_site.yml +++ b/_site.yml @@ -1,10 +1,10 @@ -name: "MyLabJournal" +name: "UCSB IAS Comps" navbar: - title: "MyLabJournal" + title: "UCSB IAS Comps" left: - - text: "Home" + - text: "Contributors" href: index.html - - text: "Journal" + - text: "Study Tips" href: Journal.html - text: "Links" href: Links.html diff --git a/docs/Journal.html b/docs/Journal.html index 554bda2ba..f2e3ac54b 100644 --- a/docs/Journal.html +++ b/docs/Journal.html @@ -1,17 +1,17 @@ - +
- + -IMPORTANT: You can delete everything in here and start fresh. You might want to start by not deleting anything above this line until you know what that stuff is doing.
-This is an .Rmd file. It is plain text with special features. Any time you write just like this, it will be compiled to normal text in the website. If you put a # in front of your text, it will create a top level-header.
-2018 | 7 | 23 Last compiled: 2019-01-28
+Here are our tips from experience with comps.
+2018 | 7 | 23 Last compiled: 2021-06-18
Notice that whatever you define as a top level header, automatically gets put into the table of contents bar on the left.
2018 | 7 | 23 Last compiled: 2019-01-28
+2018 | 7 | 23 Last compiled: 2021-06-18
I’m writing this tutorial going from the top down. And, this is how it will be printed. So, notice the second post is second in the list. If you want your most recent post to be at the top, then make a new post starting at the top. If you want the oldest first, do, then keep adding to the bottom
So far this is just a blog where you can write in plain text and serve your writing to a webpage. One of the main purposes of this lab journal is to record your progress learning R. The reason I am asking you to use this process is because you can both make a website, and a lab journal, and learn R all in R-studio. This makes everything really convenient and in the sam place.
So, let’s say you are learning how to make a histogram in R. For example, maybe you want to sample 100 numbers from a normal distribution with mean = 0, and standard deviation =1, and then you want to plot a histogram. You can do this right here by using an r code block, like this:
samples <- rnorm(100, mean=0, sd=1)
@@ -438,6 +506,49 @@ Replace this with problem 4
+
+
+
+
+
+
+
+
@@ -69,9 +69,7 @@
-
-
@@ -110,7 +110,6 @@
padding-top: 56px;
margin-top: -56px;
}
-
.section h2 {
padding-top: 56px;
margin-top: -56px;
@@ -131,6 +130,43 @@
padding-top: 56px;
margin-top: -56px;
}
+.dropdown-submenu {
+ position: relative;
+}
+.dropdown-submenu>.dropdown-menu {
+ top: 0;
+ left: 100%;
+ margin-top: -6px;
+ margin-left: -1px;
+ border-radius: 0 6px 6px 6px;
+}
+.dropdown-submenu:hover>.dropdown-menu {
+ display: block;
+}
+.dropdown-submenu>a:after {
+ display: block;
+ content: " ";
+ float: right;
+ width: 0;
+ height: 0;
+ border-color: transparent;
+ border-style: solid;
+ border-width: 5px 0 5px 5px;
+ border-left-color: #cccccc;
+ margin-top: 5px;
+ margin-right: -10px;
+}
+.dropdown-submenu:hover>a:after {
+ border-left-color: #ffffff;
+}
+.dropdown-submenu.pull-left {
+ float: none;
+}
+.dropdown-submenu.pull-left>.dropdown-menu {
+ left: -100%;
+ margin-left: 10px;
+ border-radius: 6px 0 6px 6px;
+}
+
-
+
+
+
+
+
+
+
+
+
-R and R-Studio
-R is a free open-source programming language that can be used for statistical analysis, data-simulation, graphing, and lots of other stuff. Another free program is R-studio, that provides a nice graphic interface for R. Download R first, then download R-studio. Both can run on PCs, Macs or Linux. Students will be learning R in the stats labs using the lab manual .
+
+Mendeley
+Mendeley is a free citation and PDF organizer. Create an account and download Mendeley for desktop. See here for how to get started .
-
-Additional R resources
+
+Concept maps
-- Google is great, Google your problem
-- Stackoverflow is great, google will often take you there because someone has already asked your question, and someone else has answered, usually many people have answered your question many ways.
-- Danielle Navarro wrote a free Psych Stats textbook using R, it’s worth checking out (some of our textbook are based on Danielle’s)
-- I am currently writing another stats textbook (incorporating some of the above). You can read it while it’s being made right here https://crumplab.github.io/statistics/, also check out the lab manual for more specific things about doing various stats in R (also in draft right now) https://crumplab.github.io/statisticsLab/
-- Daniell Navarro recently made this website for introducing R, it’s great, check it out (also made using this R markdown process): http://compcogscisydney.org/psyr/
-- Check out my slightly older programming book that also introduces R https://crumplab.github.io/programmingforpsych/
-- This is the definitive guide for all things R Markdown (you will find this very useful as you get better at this skill): https://bookdown.org/yihui/rmarkdown/
+- Use concept maps.
@@ -241,6 +326,23 @@ Additional R resources
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-LabJournalWebsite
-An R Markdown website template for a lab journal https://crumplab.github.io/LabJournalWebsite/index.html
-To use this, click the download as .zip button to start from a local computer, or skip down to the github example to fork this and get started that way.
-The unzipped folder contains all of the files you need to compile a website in R Markdown. This should all work fine if you have the latest version of R and R-studio installed.
-
-Steps for compiling on your local computer
-
-- Make sure R and R-studio are installed
-- Make sure the rmarkdown package is installed in R-studio. Open R-studio, click the packages tab in the lower left hand corner, click install packages, type in rmarkdown, make sure “install dependencies” is clicked on, then press install. Close R-studio.
-- Navigate to the folder you just downloaded, open the ‘LabJournalWebsite.Proj’ file. This should automatically open R-studio, and your current working environment will be inside this project. That means everything you save will be auto saved to this folder (unless you tell R-studio to save something somewhere else.
-- Inside R-studio you should see a files tab in the bottom right hand corner. Most files you click will be opened up as text files in the R-studio editor. Click the “Index.Rmd” file.
-- To compile the entire website, find the build tab in the top right hand corner. You should see the option to “build website”. Click this. The website should be built.
-- After the website is built, you should be able to see it in the R-studio browser. There is a little button (blue arrow with a little browser icon) that allows you to pop the website into your default web-browser. This way you can look at the website in your browser.
-
-Important: After compilation, all of the files for displaying your website are saved in the folder where your R project resides. When you look at these in a browser (for example, by going to the folder and dragging the index.html file into a browser), you are loading from your disk. Only you will be able to see the website, because it is on your hard-drive. You need to upload to a web server to serve the webpage on the internet.
-
-
-Steps for serving your webpage using github pages.
-This is the source code repository for making the webpage in R-studio. At the same time, the resulting website is being served from this repository at this link https://crumplab.github.io/LabJournalWebsite/index.html.
-Every github repository has the capability of serving html files (web page files) contained in the repository, this is called github pages. How this works depends a little bit on the specific repository you are using. For this repository. The webpage is served from the docs folder. The example files are set so that when you compile the example in R-studio, the output automatically goes into the docs folder. As a result, when you have these files in a github repository, github will serve the html files in your docs folder as a website.
-Steps
-
-- For this repo to your github (press the fork button in top right hand corner, then choose your github account)
-- You should now see a copy of this repo in your github account
-- Click the Settings (also near top right), scroll down to Github Pages options
-- click the optino to serve from docs folder
-- You should see a little green message above the github pages options with a link to your new webpage.
-
-Editing webpage and serving on github
-
-- download github desktop
-- make sure it is connected to your account
-- clone the website repo to your local computer
-- Open up the project file in the folder for your repo on your local computer (.rproj file)
-- Edit the .rmd files in R-studio
-- Recompile website (build website when index.rmd is loaded), or knit individual .rmd files
-- send your changes back to the online github repository (note this can be done in github desktop, or directly in R-studio, in R-studio you will see a git tab if you are working in a git repo. Click the git tab, click the diff button, which will show you if there are any new changes. Click each of the files that you want to commit. Write a short note to describe the changes. Press the commit button. Wait a couple seconds, your changes should now be served on your website).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/images/logo.png b/docs/images/logo.png
index 39736f8b6..fc3289bf4 100644
Binary files a/docs/images/logo.png and b/docs/images/logo.png differ
diff --git a/docs/index.html b/docs/index.html
index 279fdef56..a733c943f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,17 +1,17 @@
-
+
-
+
-
-
-MyLabJournal
+UCSB IAS Comps
@@ -69,9 +69,7 @@
-
-
@@ -110,7 +110,6 @@
padding-top: 56px;
margin-top: -56px;
}
-
.section h2 {
padding-top: 56px;
margin-top: -56px;
@@ -131,6 +130,43 @@
padding-top: 56px;
margin-top: -56px;
}
+.dropdown-submenu {
+ position: relative;
+}
+.dropdown-submenu>.dropdown-menu {
+ top: 0;
+ left: 100%;
+ margin-top: -6px;
+ margin-left: -1px;
+ border-radius: 0 6px 6px 6px;
+}
+.dropdown-submenu:hover>.dropdown-menu {
+ display: block;
+}
+.dropdown-submenu>a:after {
+ display: block;
+ content: " ";
+ float: right;
+ width: 0;
+ height: 0;
+ border-color: transparent;
+ border-style: solid;
+ border-width: 5px 0 5px 5px;
+ border-left-color: #cccccc;
+ margin-top: 5px;
+ margin-right: -10px;
+}
+.dropdown-submenu:hover>a:after {
+ border-left-color: #ffffff;
+}
+.dropdown-submenu.pull-left {
+ float: none;
+}
+.dropdown-submenu.pull-left>.dropdown-menu {
+ left: -100%;
+ margin-left: 10px;
+ border-radius: 6px 0 6px 6px;
+}
+
-
+
+
+
+
+
+
+
+
+
MyLabJournal
-My Lab Journal
-This is a template example for lab journaling. Students in Matt Crump’s Human Cognition and Performance Lab will use this template to learn R, and other things. Students can replace this text with more fun things. People not in my lab can use this too.
-How to use
-
-fork the repo for this website and follow instructions on read me to get set up. https://github.com/CrumpLab/LabJournalWebsite
-Blog/journal what you are doing in R, by editing the Journal.Rmd. See the Journal page for an example of what to do to get started learning R.
-See the links page for lots of helpful links on learning R.
-Change everything to make it your own.
-
+Contributors
+The past (and present, as of 2021) graduate students listed below have contributed resources so that those who follow may benefit from previous triumphs and mistakes!
+Carmen Hove
+Graduated 2021 Email: carmenhove@ucsb.edu GitHub: carmenhove
+Angela Garcia
+Graduated 2018
@@ -251,6 +339,23 @@ .nav-tabs > li').click(function () {
+ $(this).parent().toggleClass('nav-tabs-open')
+ });
+});
+
+
+
+
+
@@ -218,19 +309,16 @@
-